Merge branch 'main' into main

grongierisc · Jan 17, 2024 · da530cd · da530cd
2 parents 94bffa3 + 19428d9
commit da530cd
Show file tree

Hide file tree

Showing 5 changed files with 18,633 additions and 13,161 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,6 +12,9 @@
       "docker-compose": {
         "service": "iris",
         "internalPort": 52773
+      },
+      "links": {
+        "IRIS SQL Portal": "http://${host}:${port}/csp/sys/exp/%25CSP.UI.Portal.SQL.Home.zen?$NAMESPACE=${ns}"
       }
     },
     "sqltools.connections": [

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Easy to use HL7v2 to FHIR,  CDA to FHIR, FHIR to HL7v2 as a Service.
 The aim of this project is to provide an REST API that can convert easily various health formats.
 Post the desire format in the REST body, get the answer in the new format.
 
-* :fire: Official Version : https://aws.amazon.com/marketplace/pp/prodview-q7ryewpz75cq2 :fire:
+* :fire: Official Version : https://www.intersystems.com/IC-FTS/ :fire:
 
 * :tv: Video : https://youtu.be/lr2B7zSFkds :tv:
 

diff --git a/dockerfile b/dockerfile
@@ -1,5 +1,5 @@
 ARG IMAGE=intersystemsdc/irishealth-community:latest
-FROM $IMAGE
+FROM $IMAGE as builder
 
 ARG IRIS_PASSWORD
 
@@ -22,3 +22,11 @@ COPY misc/swagger.yml /usr/irissys/csp/swagger-ui/swagger.yml
 RUN old=http://localhost:52773/crud/_spec && \
 	new=./swagger.yml && \
 	sed -i "s|$old|$new|g" /usr/irissys/csp/swagger-ui/index.html
+
+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/ 
diff --git a/iris.script b/iris.script
@@ -6,7 +6,9 @@
 
     zn "HSLIB"
     // Install a Foundation namespace and change to it
-    Do ##class(HS.HC.Util.Installer).InstallFoundation("HEALTHTOOLKIT")
+    #; Do ##class(HS.HC.Util.Installer).InstallFoundation("HEALTHTOOLKIT")
+    Do ##class(HS.Util.Installer.Foundation).Install("HEALTHTOOLKIT")
+
     zn "HEALTHTOOLKIT"
 
     // Install FHIR repo
@@ -39,6 +41,5 @@
 
     ; zpm install openapi class definiton
     zpm "install swagger-ui"
-    q
 
-halt
+    halt