fixes

Author: Evgeny Shvarov

.env

@@ -1 +1,5 @@
 IRIS_PORT=52773
+DOCKERFILE=Dockerfile-zpm-samplesbi
+DOCKERFILE=Dockerfile
+DOCKERFILE=Dockerfile-20192
+DOCKERFILE=Dockerfile-zpm

Dockerfile-zpm

@@ -21,13 +21,17 @@ COPY  Installer.cls .
 COPY  src src
 COPY irissession.sh /
 
+# running IRIS and open IRIS termninal in USER namespace
 SHELL ["/irissession.sh"]
-
+# below is objectscript executed in terminal
+# each row is what you type in terminal and Enter
 RUN \
   do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
+  set sc = ##class(App.Installer).setup() \
   Do $system.OBJ.Load("/tmp/deps/zpm.xml", "ck") \
-  zpm "install webterminal" \
-  set sc = ##class(App.Installer).setup() 
-
+  zn "IRISAPP" \
+  zpm "install webterminal" 
 
-CMD [ "-l", "/usr/irissys/mgr/messages.log" ]
+# bringing the standard shell back
+SHELL ["/bin/bash", "-c"]
+CMD [ "-l", "/usr/irissys/mgr/messages.log" ]

docker-compose.yml

@@ -1,7 +1,9 @@
 version: '3.6'
 services:
   iris:
-    build: .
+    build: 
+      context: .
+      dockerfile: ${DOCKERFILE:-Dockerfile}
     restart: always
     ports: 
       - 51773

irissession.sh

@@ -4,9 +4,10 @@ iris start $ISC_PACKAGE_INSTANCENAME quietly
 
 cat << EOF | iris session $ISC_PACKAGE_INSTANCENAME -U %SYS
 do ##class(%SYSTEM.Process).CurrentDirectory("$PWD")
-Do ##class(Security.Users).UnExpireUserPasswords("*")
 $@
 if '\$Get(sc) do ##class(%SYSTEM.Process).Terminate(, 1)
+zn "%SYS"
+Do ##class(Security.Users).UnExpireUserPasswords("*")
 do ##class(SYS.Container).QuiesceForBundling()
 do ##class(SYS.Container).SetMonitorStateOK("irisowner")
 halt