docker environment update, zpm module.xml

Author: Evgeny Shvarov

.gitattributes

@@ -0,0 +1,5 @@
+*.sh text eol=lf
+*.cls text eol=lf
+*.mac text eol=lf
+*.int text eol=lf
+Dockerfil* text eol=lf

.vscode/settings.json

@@ -1,16 +1,18 @@
 {
-  "objectscript.conn": {
-    "active": true,
-    "host": "localhost",
-    "port": 52791,
-    "ns": "SAMPLES",
-  },
-  "objectscript.format": {
-    "commandCase": "lower",
-    "functionCase": "lower"
-  },
-  "objectscript.export": {
-    "folder": "src",
-    "addCategory": false
-  }
+    "files.associations": {
+    
+        "Dockerfile*": "dockerfile",
+      },
+    "objectscript.conn" :{
+      "ns": "SAMPLES",
+      "active": true,
+      "docker-compose": {
+        "service": "iris",
+        "internalPort": 52773
+      }
+    },
+    "objectscript.conn.active": true,
+    
+  
+
 }

Dockerfile

@@ -1,32 +1,25 @@
-ARG IMAGE=store/intersystems/iris-community:2019.2.0.107.0
+ARG IMAGE=intersystems/iris:2019.1.0S.111.0
+ARG IMAGE=store/intersystems/irishealth:2019.3.0.308.0-community
 ARG IMAGE=store/intersystems/iris-community:2019.3.0.309.0
+ARG IMAGE=store/intersystems/iris-community:2019.4.0.379.0
 FROM $IMAGE
 
 USER root
 
-RUN mkdir /opt/app && chown irisowner:irisowner /opt/app
+WORKDIR /opt/irisapp
+RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /opt/irisapp
 
 USER irisowner
 
-WORKDIR /opt/app
+COPY  Installer.cls .
+COPY  src src
+COPY irissession.sh /
+SHELL ["/irissession.sh"]
 
-COPY ./Installer.cls ./
-COPY ./src ./src/
+RUN \
+  do $SYSTEM.OBJ.Load("Installer.cls", "ck") \
+  set sc = ##class(App.Installer).setup() 
 
-RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
-    /bin/echo -e "sys\nsys\n" \
-            " Do ##class(Security.Users).UnExpireUserPasswords(\"*\")\n" \
-            " Do ##class(Security.Users).AddRoles(\"admin\", \"%ALL\")\n" \
-            " Do ##class(Security.System).Get(,.p)\n" \
-            " // 2**4 = 16; this sets bit 4 to enable OS authentication for the admin user" \
-            " Set p(\"AutheEnabled\")=\$zboolean(p(\"AutheEnabled\"),16,7)\n" \
-            " Do ##class(Security.System).Modify(,.p)\n" \
-            " 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" \
-            " halt" \
-    | iris session $ISC_PACKAGE_INSTANCENAME && \
-    /bin/echo -e "sys\nsys\n" \
-    | iris stop $ISC_PACKAGE_INSTANCENAME quietly
-
-CMD [ "-l", "/usr/irissys/mgr/messages.log" ]
+# bringing the standard shell back
+SHELL ["/bin/bash", "-c"]
+CMD [ "-l", "/usr/irissys/mgr/messages.log" ]

Installer.cls

@@ -1,30 +1,32 @@
 Class App.Installer
 {
 
-XData MyInstall [ XMLNamespace = INSTALLER ]
+XData setup
 {
 <Manifest>
-  <Default Name="NAMESPACE" Value="SAMPLES"/>
-  <Default Name="DBNAME" Value="SAMPLES"/>
-  <Default Name="APPPATH" Dir="/opt/app/" />
-  <Default Name="SOURCESPATH" Dir="${APPPATH}src" />
-  <Default Name="RESOURCE" Value="%DB_${DBNAME}" /> 
+  <Default Name="SourceDir" Value="#{$system.Process.CurrentDirectory()}src"/>
+  <Default Name="Namespace" Value="SAMPLES"/>
+  <Default Name="app" Value="irisapp" />
+
+  <Namespace Name="${Namespace}" Code="${Namespace}" Data="${Namespace}" Create="yes" Ensemble="no">
 
-  <Namespace Name="${NAMESPACE}" Code="${DBNAME}-CODE" Data="${DBNAME}-DATA" Create="yes" Ensemble="0">
     <Configuration>
-      <Database Name="${DBNAME}-CODE" Dir="${APPPATH}${DBNAME}-CODE" Create="yes" Resource="${RESOURCE}"/>
-      <Database Name="${DBNAME}-DATA" Dir="${APPPATH}${DBNAME}-DATA" Create="yes" Resource="${RESOURCE}"/>
-    </Configuration>
+      <Database Name="${Namespace}" Dir="/opt/${app}/data" Create="yes" Resource="%DB_${Namespace}"/>
 
-    <Import File="${SOURCESPATH}" Recurse="1"/>
+      <Import File="${SourceDir}" Flags="ck" Recurse="1"/>
+    </Configuration>
+    <CSPApplication Url="/csp/${app}" Directory="${cspdir}${app}"  ServeFiles="1" Recurse="1" MatchRoles=":%DB_${Namespace}" AuthenticationMethods="32"
+       
+    />
   </Namespace>
 
 </Manifest>
 }
 
 ClassMethod setup(ByRef pVars, pLogLevel As %Integer = 3, pInstaller As %Installer.Installer, pLogger As %Installer.AbstractLogger) As %Status [ CodeMode = objectgenerator, Internal ]
 {
-  Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "MyInstall")
+  #; Let XGL document generate code for this method. 
+  Quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "setup")
 }
 
 }

docker-compose.yml

@@ -1,10 +1,14 @@
-version: '2.4'
+version: '3.6'
 services:
   iris:
-    build: .
+    build: 
+      context: .
+      dockerfile: Dockerfile
     restart: always
-    ports:
-      - 52791:52773
+    ports: 
+      - 51773
+      - 52773
+      - 53773
     volumes:
       - ~/iris.key:/usr/irissys/mgr/iris.key
-      - ./:/iris/app
+      - ./:/irisdev/app

irissession.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+iris start $ISC_PACKAGE_INSTANCENAME quietly
+ 
+cat << EOF | iris session $ISC_PACKAGE_INSTANCENAME -U %SYS
+do ##class(%SYSTEM.Process).CurrentDirectory("$PWD")
+$@
+if '\$Get(sc) do ##class(%SYSTEM.Process).Terminate(, 1)
+zn "%SYS"
+do ##class(SYS.Container).QuiesceForBundling()
+Do ##class(Security.Users).UnExpireUserPasswords("*")
+halt
+EOF
+
+exit=$?
+
+iris stop $ISC_PACKAGE_INSTANCENAME quietly
+
+exit $exit

module.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="25">
+  <Document name="samples-objectscript.ZPM">
+    <Module>
+      <Name>samples-objectscript</Name>
+      <Version>1.0.0</Version>
+      <Packaging>module</Packaging>
+      <SourcesRoot>src</SourcesRoot>
+      <Resource Name="ObjectScript.PKG"/>
+    </Module>
+    
+  </Document>
+</Export>