Skip to content

Commit db42339

Browse files
Evgeny ShvarovEvgeny Shvarov
authored andcommitted
switch to iris.script. Update to 2020.3 images
1 parent 2d9ee3b commit db42339

File tree

4 files changed

+18
-29
lines changed

4 files changed

+18
-29
lines changed

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
"files.associations": {
33

44
"Dockerfile*": "dockerfile",
5+
"iris.script": "objectscript"
56
},
67
"objectscript.conn" :{
78
"ns": "IRISAPP",
89
"active": true,
10+
"username":"_SYSTEM",
11+
"password": "SYS",
912
"docker-compose": {
1013
"service": "iris",
1114
"internalPort": 52773

Dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
ARG IMAGE=store/intersystems/iris-community:2020.1.0.204.0
22
ARG IMAGE=intersystemsdc/iris-community:2020.1.0.209.0-zpm
33
ARG IMAGE=intersystemsdc/iris-community:2020.2.0.204.0-zpm
4+
ARG IMAGE=intersystemsdc/iris-community:2020.3.0.200.0-zpm
5+
ARG IMAGE=intersystemsdc/irishealth-community:2020.3.0.200.0-zpm
46
FROM $IMAGE
57

68
USER root
79

810
WORKDIR /opt/irisapp
911
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
10-
COPY irissession.sh /
11-
RUN chmod +x /irissession.sh
12-
1312
USER ${ISC_PACKAGE_MGRUSER}
1413

1514
COPY Installer.cls .
1615
COPY src src
17-
SHELL ["/irissession.sh"]
18-
19-
RUN \
20-
do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
21-
set sc = ##class(App.Installer).setup()
16+
COPY iris.script /tmp/iris.script
2217

23-
# bringing the standard shell back
24-
SHELL ["/bin/bash", "-c"]
18+
# run iris and initial
19+
RUN iris start IRIS \
20+
&& iris session IRIS < /tmp/iris.script

iris.script

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
; run installer to create namespace
2+
do $SYSTEM.OBJ.Load("/opt/irisapp/Installer.cls", "ck")
3+
set sc = ##class(App.Installer).setup()
4+
5+
zn "%SYS"
6+
Do ##class(Security.Users).UnExpireUserPasswords("*")
7+
8+
; call your initial methods here
9+
halt

irissession.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)