refaactor

Author: grongierisc

.gitignore

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

.vscode/settings.json

@@ -6,7 +6,7 @@
       },
     "objectscript.conn" :{
       "ns": "IRISAPP",
-      "username": "_SYSTEM",
+      "username": "SuperUser",
       "password": "SYS",
       "docker-compose": {
         "service": "iris",

Dockerfile

@@ -1,49 +1,18 @@
 ARG IMAGE=intersystemsdc/iris-community:latest
-FROM $IMAGE as builder
+FROM $IMAGE 
 
-# use the root user to install packages
-USER root   
-
-# create a directory for the application     
 WORKDIR /irisdev/app
-RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} /irisdev/app
-USER ${ISC_PACKAGE_MGRUSER}
-
-# Copy the source code
-COPY . .
-COPY iris.script /tmp/iris.script
-
-# install required packages
-RUN pip3 install -r requirements.txt
 
-# environment variables for embedded python
+## Python stuff
 ENV IRISUSERNAME "SuperUser"
 ENV IRISPASSWORD "SYS"
 ENV IRISNAMESPACE "IRISAPP"
 
-# create the namespace and install the application
-RUN iris start IRIS \
-	&& iris session IRIS < /tmp/iris.script \
-    && /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"
-
-RUN pip install iris-pex-embedded-python
-
+ENV PYTHON_PATH=/usr/irissys/bin/
 ENV LD_LIBRARY_PATH=${ISC_PACKAGE_INSTALLDIR}/bin:${LD_LIBRARY_PATH}
 
-COPY --chown=${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} entrypoint.sh /
+ENV PATH "/home/irisowner/.local/bin:/usr/irissys/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/irisowner/bin"
+
+COPY . .
 
-ENTRYPOINT [ "/tini", "--", "/entrypoint.sh" ]
+RUN pip3 install -r requirements.txt

Installer.cls

@@ -5,11 +5,14 @@ services:
       context: .
       dockerfile: Dockerfile
     restart: always
+    environment:
+      - ISC_CPF_MERGE_FILE=/irisdev/app/merge.cpf
     command: 
       --check-caps false
     ports: 
       - 1972
       - 53795:52773
       - 53773
     volumes:
-      - ./:/irisdev/app
+      - ./:/irisdev/app
+      - ./init.db/:/docker-entrypoint-initdb.d/

docker-compose.yml

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -m
+
+fg %1
+
+/usr/irissys/dev/Cloud/ICM/waitISC.sh
+
+# init iop
+iop --init
+
+# load production
+iop -m /irisdev/app/src/python/reddit/settings.py
+
+# start production
+iop --start dc.Python.Production &

entrypoint.sh

@@ -0,0 +1,8 @@
+[Actions]
+CreateResource:Name=%DB_IRISAPP_DATA,Description="IRISAPP_DATA database"
+CreateDatabase:Name=IRISAPP_DATA,Directory=/usr/irissys/mgr/IRISAPP_DATA
+CreateResource:Name=%DB_IRISAPP_CODE,Description="IRISAPP_CODE database"
+CreateDatabase:Name=IRISAPP_CODE,Directory=/usr/irissys/mgr/IRISAPP_CODE
+CreateNamespace:Name=IRISAPP,Globals=IRISAPP_DATA,Routines=IRISAPP_CODE,Interop=1
+ModifyService:Name=%Service_CallIn,Enabled=1,AutheEnabled=48
+ModifyUser:Name=SuperUser,PasswordHash=a31d24aecc0bfe560a7e45bd913ad27c667dc25a75cbfd358c451bb595b6bd52bd25c82cafaa23ca1dd30b3b4947d12d3bb0ffb2a717df29912b743a281f97c1,0a4c463a2fa1e7542b61aa48800091ab688eb0a14bebf536638f411f5454c9343b9aa6402b4694f0a89b624407a5f43f0a38fc35216bb18aab7dc41ef9f056b1,10000,SHA512

init.db/entrypoint.sh

@@ -1,2 +1,3 @@
 dataclasses-json==0.5.7
-requests==2.27.1
+requests==2.27.1
+iris-pex-embedded-python>=2.0.0