refactor template for 2.3.0

Author: grongierisc

.gitignore

@@ -3,3 +3,4 @@ __pycache__
 
 
 iris-main.log
+.venv

.vscode/launch.json

@@ -7,7 +7,7 @@
       "request": "launch",
       "program": "${file}",
       "console": "integratedTerminal",
-      "justMyCode": true
+      "justMyCode": false
     },
     {
       "type": "objectscript",

.vscode/settings.json

@@ -15,8 +15,19 @@
       "active": true,
       "links": {
         "Production": "http://localhost:${port}/csp/irisapp/EnsPortal.ProductionConfig.zen?PRODUCTION=dc.Demo.Production"
-}
+      }
     },
+    "intersystems.servers": {
+			"devcontainer": {
+				"username": "SuperUser",
+				"password": "SYS",
+				"webServer": {
+					"scheme": "http",
+					"host": "127.0.0.1",
+					"port": 52773
+				},
+			},
+		},
     "sqltools.connections": [
       {
         "namespace": "IRISAPP",
@@ -31,6 +42,10 @@
         "username": "_SYSTEM",
         "password": "SYS"
       }
-    ]
+    ],
+    "[python]": {
+      "editor.defaultFormatter": "ms-python.autopep8"
+    },
+    "python.formatting.provider": "none"
 
 }

Dockerfile

@@ -1,5 +1,5 @@
 ARG IMAGE=intersystemsdc/iris-community:latest
-FROM $IMAGE
+FROM $IMAGE as builder
 
 # use the root user to install packages
 USER root   
@@ -24,8 +24,18 @@ ENV IRISNAMESPACE "IRISAPP"
 # create the namespace and install the application
 RUN iris start IRIS \
 	&& iris session IRIS < /tmp/iris.script \
-    && /usr/irissys/bin/irispython src/python/register.py \
+    && /usr/irissys/bin/irispython -m grongier.pex -M /irisdev/app/src/python/reddit/settings.py \
     && iris stop IRIS quietly
 
+FROM $IMAGE as final
 
+ADD --chown=${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} https://github.com/grongierisc/iris-docker-multi-stage-script/releases/latest/download/copy-data.py /irisdev/app/copy-data.py
 
+RUN --mount=type=bind,source=/,target=/builder/root,from=builder \
+	cp -f /builder/root/usr/irissys/iris.cpf /usr/irissys/iris.cpf && \
+	python3 /irisdev/app/copy-data.py -c /usr/irissys/iris.cpf -d /builder/root/ 
+
+# environment variables for embedded python
+ENV IRISUSERNAME "SuperUser"
+ENV IRISPASSWORD "SYS"
+ENV IRISNAMESPACE "IRISAPP"

iris.script

@@ -3,9 +3,6 @@
 
  zn "IRISAPP"
  zpm "install pex-embbeded-python" 
- do $System.OBJ.LoadDir("/irisdev/app/src","ck",,1)
-
- set ^EnsPortal.Settings("SuperUser","LastProduction")	= "dc.Demo.Production"
 
  zn "%SYS"
  Do ##class(Security.Users).UnExpireUserPasswords("*")

src/dc/Demo/Production.cls

@@ -32,4 +32,5 @@ def on_python_message(self, request: PostMessage):
 
         if request.found is not None:
             self.send_request_sync(self.target,request)
+
         return