Skip to content

Commit fef289f

Browse files
Evgeny ShvarovEvgeny Shvarov
authored andcommitted
docker template simplified
1 parent 2994948 commit fef289f

12 files changed

Lines changed: 44 additions & 188 deletions

.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ IRIS_PORT=52773
22
DOCKERFILE=Dockerfile-zpm-samplesbi
33
DOCKERFILE=Dockerfile
44
DOCKERFILE=Dockerfile-20192
5-
DOCKERFILE=Dockerfile-zpm
5+
DOCKERFILE=Dockerfile-zpm
6+
DOCKERFILE=Dockerfile-web

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ SHELL ["/irissession.sh"]
1717

1818
RUN \
1919
do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
20-
set sc = ##class(App.Installer).setup()
21-
20+
set sc = ##class(App.Installer).setup()
2221

22+
# bringing the standard shell back
23+
SHELL ["/bin/bash", "-c"]
2324
CMD [ "-l", "/usr/irissys/mgr/messages.log" ]

Dockerfile-web

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
ARG IMAGE=intersystems/iris:2019.1.0S.111.0
2+
ARG IMAGE=store/intersystems/irishealth:2019.3.0.308.0-community
3+
ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
4+
FROM $IMAGE
5+
6+
USER root
7+
8+
WORKDIR /opt/irisapp
9+
RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
10+
11+
USER irisowner
12+
13+
COPY Installer.cls .
14+
COPY src src
15+
COPY irissession.sh /
16+
SHELL ["/irissession.sh"]
17+
18+
RUN \
19+
do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
20+
set sc = ##class(App.Installer).setup() \
21+
zn "%SYS" \
22+
write "Create web application ...",! \
23+
set webName = "/csp/irisweb" \
24+
set webProperties("NameSpace") = "IRISAPP" \
25+
set webProperties("Enabled") = 1 \
26+
set webProperties("IsNameSpaceDefault") = 1 \
27+
set webProperties("CSPZENEnabled") = 1 \
28+
set webProperties("AutheEnabled") = 32 \
29+
set webProperties("iKnowEnabled") = 1 \
30+
set webProperties("DeepSeeEnabled") = 1 \
31+
set sc = ##class(Security.Applications).Create(webName, .webProperties) \
32+
write "Web application "_webName_" has been created!",!
33+
34+
35+
# bringing the standard shell back
36+
SHELL ["/bin/bash", "-c"]
37+
CMD [ "-l", "/usr/irissys/mgr/messages.log" ]

Dockerfile-webapp

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

Dockerfile-zpm-samplesbi

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

Dockerfile-zpm-webterminal

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

docker-compose-20192.yml

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

docker-compose-zpm-samplesbi.yml

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

docker-compose-zpm-webterminal.yml

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

docker-compose-zpm.yml

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

0 commit comments

Comments
 (0)