cleanup and doc. fix zpm dockerfile

Author: Evgeny Shvarov

Dockerfile-20193

@@ -2,13 +2,15 @@ ARG IMAGE=intersystems/iris:2019.1.0S.111.0
 ARG IMAGE=store/intersystems/iris:2019.1.0.511.0-community
 ARG IMAGE=store/intersystems/iris:2019.2.0.107.0-community
 #ARG IMAGE=intersystems/iris:2019.3.0.302.0
+ARG IMAGE=store/intersystems/iris-community:2019.3.0.302.0
 FROM $IMAGE
-ARG IMAGE=store/intersystems/iris:2019.3.0.302.0-community
 
 USER root
 WORKDIR /opt/app
 RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/app
 
+USER irisowner
+
 COPY ./Installer.cls ./
 COPY ./src/cls ./src/cls
 #COPY ./src/dfi ./src/dfi
@@ -20,19 +22,21 @@ RUN mkdir -p /tmp/deps \
  && wget -q https://pm.community.intersystems.com/packages/zpm/latest/installer -O zpm.xml
 
 
-RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
-    /bin/echo -e "sys\nsys\n" \
+RUN iris start $ISC_PACKAGE_INSTANCENAME quietly && \
+    /bin/echo -e \
+            "zn \"%SYS\"\n" \
             " Do ##class(Security.Users).UnExpireUserPasswords(\"*\")\n" \
+            "zn \"USER\"\n" \
             " Do \$system.OBJ.Load(\"/tmp/deps/zpm.xml\", \"ck\")" \
-            " zpm \"install webterminal\"" \
             " Do \$system.OBJ.Load(\"/opt/app/Installer.cls\",\"ck\")\n" \
             " Set sc = ##class(App.Installer).setup(, 3)\n" \
             " If 'sc do \$zu(4, \$JOB, 1)\n" \
+            " zpm \"install webterminal\""
             " halt" \
     | iris session $ISC_PACKAGE_INSTANCENAME && \
     /bin/echo -e "sys\nsys\n" \
     | iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
-USER irisowner
+USER ${ISC_PACKAGE_MGRUSER}
 
 CMD [ "-l", "/usr/irissys/mgr/messages.log" ]