Merge branch 'master' into master

Author: evshvarov

Dockerfile

@@ -1,31 +1,17 @@
-FROM intersystems/iris:2019.1.0S.111.0
-
-# version DeepSeeWeb
-ARG DSW_VERSION=2.1.32
-
+FROM store/intersystems/iris:2019.1.0.511.0-community
 
 WORKDIR /opt/app
 
 COPY ./src/ ./src/
-COPY dswinstaller.cls ./
-
-
-RUN DEBIAN_FRONTEND=noninteractive apt-get update \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        curl
 
 RUN mkdir -p /tmp/deps \
 
  && cd /tmp/deps \
 
- # Download MDX2JSON, just master branch from github as archive
- && curl -L -q https://github.com/eduard93/Cache-MDX2JSON/archive/master.tar.gz | tar xvfzC - . \
-
- # Download DeepSeeWeb from releases
- && curl -L -q https://github.com/intersystems-ru/DeepSeeWeb/releases/download/${DSW_VERSION}/DSW.Installer.${DSW_VERSION}.xml -o deepseeweb.xml \
+ && wget -q https://pm.community.intersystems.com/packages/zpm/latest/installer -O zpm.xml \
 
  # Download globals data
-&& curl -s https://api.github.com/repos/intersystems-community/dc-analytics/releases/latest \
+&& wget -q -O - https://api.github.com/repos/intersystems-community/dc-analytics/releases/latest \
   | egrep 'http.*DCAnalytics_globals.*gz' \
   | cut -d : -f 2,3 \
   | tr -d '"' \
@@ -40,13 +26,10 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
             " Do ##class(Security.System).Get(,.p)\n" \
             " Set p(\"AutheEnabled\")=\$zb(p(\"AutheEnabled\"),16,7)\n" \
             " Do ##class(Security.System).Modify(,.p)\n" \
-            " set ^%SYS(\"CSP\",\"DefaultFileCharset\")=\"utf-8\"\n" \
-            # " do \$system.OBJ.Load(\"/tmp/deps/Cache-MDX2JSON-master/MDX2JSON/Installer.cls.xml\",\"ck\")\n" \
-            # " do \$system.OBJ.Load(\"/tmp/deps/deepseeweb.xml\",\"ck\")\n" \
-            " s sc=##class(DSWMDX2JSON.Installer).setup()\n" \
-            " If 'sc do \$zu(4, \$JOB, 1)\n" \
-            # "do CreateDatabase^%SYS.SQLSEC(\"DCANALYTICS\",\"\",,0)\n" \
-            " zn \"DCANALYTICS\"\n" \
+            " Do \$system.OBJ.Load(\"/tmp/deps/zpm.xml\", \"ck\")" \
+            " do CreateDatabase^%SYS.SQLSEC(\"DCANALYTICS\",\"\",,0)\n" \
+            " zn \"DCANALYTICS\"" \
+            " zpm \"install dsw\"" \
             " do \$system.OBJ.ImportDir(\"/opt/app/src\",,\"ck\",,1)\n" \
             " do ##class(Community.Utils).setup(\"/opt/app/globals.xml\")" \
             " halt" \
@@ -56,7 +39,6 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyId=sys,sys && \
 
 COPY ./other/dcanalytics.json /usr/irissys/csp/dsw/configs/
 
-COPY ./buildiknow.sh ./
 COPY ./fixoverlay.sh ./
 
-CMD [ "-l", "/usr/irissys/mgr/messages.log", "-a", "/opt/app/buildiknow.sh", "-b", "/opt/app/fixoverlay.sh" ]
+CMD [ "-b", "/opt/app/fixoverlay.sh" ]

buildiknow.sh

@@ -6,5 +6,4 @@ services:
     ports:
       - 52774:52773
     volumes:
-      - ~/iris.key:/usr/irissys/mgr/iris.key
       - ./src:/usr/src

docker-compose.yml

@@ -72,7 +72,7 @@ ClassMethod UpdateCubes(verbose = 1) As %Status
 	set cube=""
 	for {
 		set cube=$Order(list(cube)) 
-		if (cube="POST") continue
+		#; if (cube="POST") continue
 		quit:cube=""
 
 		Set st1 = ##class(%DeepSee.Utils).%BuildCube(cube, $$$YES, verbose)