iris version update

Author: daimor

.ci/build_artifacts.sh

@@ -2,20 +2,17 @@
 
 ARTIFACT=`pwd`/out/zUtils.FileBinaryTar.xml
 
-iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyID=admin,sys \
+iris start $ISC_PACKAGE_INSTANCENAME quietly \
 
-/bin/echo -e 'admin\nsys\n' \
-  "do \$system.OBJ.Export(\"%zUtils.FileBinaryTar.cls\", \"$ARTIFACT\", \"/diffexport\")\n" \
+/bin/echo -e '' \
+  "do \$system.OBJ.Export(\"%zUtils.FileBinaryTar.cls\", \"$ARTIFACT\", \"/diffexport/exportversion=2017.1\")\n" \
   "halt" \
 | iris session $ISC_PACKAGE_INSTANCENAME
 
-/bin/echo -e 'admin\nsys\n' \
+/bin/echo -e '' \
 | iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
 if [ ! -f "$ARTIFACT" ]
 then
   exit 1
 fi
-
-sed -i.bak 's/^<Export generator="IRIS" .*$/<Export generator="Cache" version="25">/g' $ARTIFACT
-rm -rf "$ARTIFACT.bak"

.ci/tests_entrypoint.sh

@@ -2,15 +2,15 @@
 
 TESTS=`pwd`/tests/src
 
-iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyID=admin,sys \
+iris start $ISC_PACKAGE_INSTANCENAME quietly \
 
-/bin/echo -e 'admin\nsys\n' \
+/bin/echo -e '' \
   "set ^UnitTestRoot=\"$TESTS\"\n" \
   'do ##class(%UnitTest.Manager).RunTest()\n' \
   'halt\n' \
 | iris session $ISC_PACKAGE_INSTANCENAME | tee /tmp/tests.log
 
-/bin/echo -e 'admin\nsys\n' \
+/bin/echo -e '' \
 | iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
 if ! grep -iq "All PASSED" /tmp/tests.log 

.vscode/settings.json

@@ -2,9 +2,9 @@
     "objectscript.conn": {
         "active": true,
         "ns": "%SYS",
-        "port": "52775",
-        "username": "test",
-        "password": "test"
+        "docker-compose": {
+          "service": "iris"
+        }
     },
     "objectscript.conn.version": 3
 }

Dockerfile

@@ -1,17 +1,16 @@
-FROM daimor/intersystems-iris:2019.1.0S.111.0-community
+FROM store/intersystems/iris-community:2020.1.0.202.0
 
 WORKDIR /opt
 
 COPY src src
 COPY .ci/* /
 
-RUN iris start $ISC_PACKAGE_INSTANCENAME quietly EmergencyID=admin,sys \
- && /bin/echo -e "admin\nsys\n" \
+RUN iris start $ISC_PACKAGE_INSTANCENAME quietly \
+ && /bin/echo -e "" \
         'do $system.OBJ.ImportDir("/opt/src/", "*.cls", "ck", , 1)\n' \
         'zn "USER"\n' \
         'set ^UnitTestRoot="/opt/tests/src/"\n' \
         'do $system.OBJ.SetQualifiers("/nodelete")\n' \
         'halt\n' \
   | iris session $ISC_PACKAGE_INSTANCENAME \
- && /bin/echo -e "admin\nsys\n" \
-  | iris stop $ISC_PACKAGE_INSTANCENAME quietly
+ && iris stop $ISC_PACKAGE_INSTANCENAME quietly

docker-compose.yml

@@ -3,9 +3,6 @@ services:
   iris: 
     build: .
     ports:
-      - 52775:52773
-    environment: 
-      - IRIS_USER=test
-      - IRIS_PASSWORD=test
+      - 52773-52783:52773
     volumes:
       - ./tests:/opt/tests