upgrade

Author: daimor

Dockerfile

@@ -1,4 +1,4 @@
-ARG CACHE_VERSION=2017.2
+ARG CACHE_VERSION=2018.1
 FROM node:8-alpine AS web
 
 WORKDIR /opt/blocks/

Dockerfile.iris

@@ -1,4 +1,3 @@
-ARG IRIS_VERSION=2018.1
 FROM node:8-alpine AS web
 
 WORKDIR /opt/blocks/
@@ -9,7 +8,7 @@ RUN npm install \
   && export PATH="$PATH:./node_modules/.bin" \
   && webpack --mode production
 
-FROM daimor/intersystems-iris:${IRIS_VERSION}
+FROM store/intersystems/iris-community:2020.1.0.202.0
 
 WORKDIR /opt/blocks/
 

README.md

@@ -19,19 +19,18 @@ Database Blocks Explorer for InterSystems Caché
 You need license key for Caché or IRIS on RedHat systems.
 ##### Caché
 ```
-docker run -d --name cacheblocksexplorer --rm \
+docker run -d --name blocksexplorer --rm \
        -p 52773:52773 \
        -v /opt/some/database/for/test:/opt/blocks/db/test \
        -v ~/cache.key:/usr/cachesys/mgr/cache.key
-       daimor/cacheblocksexplorer:cache
+       daimor/blocksexplorer:cache
 ```
 ##### IRIS
 ```
-docker run -d --name cacheblocksexplorer --rm \
+docker run -d --name blocksexplorer --rm \
        -p 57772:57772 \
        -v /opt/some/database/for/test:/opt/blocks/db/test \
-       -v ~/iris.key:/usr/irissys/mgr/iris.key
-       daimor/cacheblocksexplorer:iris
+       daimor/blocksexplorer:iris
 ```
 
 ## Screenshots

docker-compose.cache.yml

@@ -0,0 +1,17 @@
+version: "2.4"
+
+services:
+  server:
+    build:
+      context: server
+      args:
+        CACHE_VERSION: ${CACHE_VERSION-2017.1}
+    ports:
+      - "${CACHE_WEBPORT-57772}:57772"
+      - "${CACHE_PORT-1972}:1972"
+    volumes:
+      - ~/cache.key:/usr/cachesys/mgr/cache.key
+      - ./server/src:/opt/blocks/src
+  web:
+    environment:
+      - DB_PORT=57772

docker-compose.iris.yml

@@ -1,33 +1,16 @@
-version: "3"
+version: "2.4"
 
 services:
   server:
     build:
       context: server
       dockerfile: Dockerfile.iris
-      args:
-        IRIS_VERSION: ${IRIS_VERSION-2018.1}
     ports:
       - "${IRIS_WEBPORT-52773}:52773"
       - "${IRIS_PORT-51773}:51773"
     volumes:
       - ~/iris.key:/usr/irissys/mgr/iris.key
       - ./server/src:/opt/blocks/src
   web:
-    build:
-      context: web
-    links:
-      - server
     environment:
-      - DB_HOST=server
-      - DB_PORT=${IRIS_WEBPORT-52773}
-      - WEB_PORT=${WEB_PORT-80}
-    ports:
-      - "${WEB_PORT-80}:${WEB_PORT-80}"
-    volumes:
-      - node_modules:/opt/app/node_modules
-      - web_build:/opt/app/build
-      - ./web:/opt/app
-volumes:
-  node_modules: null
-  web_build: null
+      - DB_PORT=52773

docker-compose.yml

@@ -1,25 +1,20 @@
-version: "3"
+version: "2.4"
 
 services:
   server:
-    build:
-      context: server
-      args:
-        CACHE_VERSION: ${CACHE_VERSION-2017.1}
-    ports:
-      - "${CACHE_WEBPORT-57772}:57772"
-      - "${CACHE_PORT-1972}:1972"
-    volumes:
-      - ~/cache.key:/usr/cachesys/mgr/cache.key
-      - ./server/src:/opt/blocks/src
+    extends:
+      file: docker-compose.${MODE:-iris}.yml
+      service: server
   web:
+    extends:
+      file: docker-compose.${MODE:-iris}.yml
+      service: web
     build:
       context: web
     links:
       - server
     environment:
       - DB_HOST=server
-      - DB_PORT=${CACHE_WEBPORT-57772}
       - WEB_PORT=${WEB_PORT-80}
     ports:
       - "${WEB_PORT-80}:${WEB_PORT-80}"

module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="25">
-<Document name="CacheBlocksExplorer.MODULE"><Module>
- <Name>CacheBlocksExplorer</Name>
+<Document name="BlocksExplorer.MODULE"><Module>
+ <Name>BlocksExplorer</Name>
   <Version>0.0.1</Version>
   <Packaging>module</Packaging>
   <LifecycleClass>Blocks.Lifecycle</LifecycleClass>

server/Dockerfile.iris

@@ -1,17 +1,28 @@
-ARG IRIS_VERSION=2018.1
-FROM daimor/intersystems-iris:${IRIS_VERSION}
+ARG IRIS_VERSION=2020.1.0.202.0
+FROM store/intersystems/iris-community:${IRIS_VERSION}
 
 WORKDIR /opt/blocks
 
+USER root
+
+RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} ${PWD}
+
+USER irisowner
+
 COPY ./src/ ./src
 
-RUN iris start $ISC_PACKAGE_INSTANCENAME quietly \
- && /bin/echo -e "do ##class(%SYSTEM.OBJ).Load(\"/opt/blocks/src/DevInstaller.cls\",\"cdk\")\n" \
+RUN iris start $ISC_PACKAGE_INSTANCENAME quietly && \
+    /bin/echo -e "" \
+                 "do ##class(%SYSTEM.OBJ).Load(\"/opt/blocks/src/DevInstaller.cls\",\"cdk\")\n" \
                  "set sc=##class(Blocks.DevInstaller).setupWithVars(\"/opt/blocks/\")\n" \
                  "do:'sc \$zu(4,\$j,1)\n" \
-                 "Halt\n" \
-  | iris session ${ISC_PACKAGE_INSTANCENAME} \
- && iris stop $ISC_PACKAGE_INSTANCENAME quietly
+                 "do INT^JRNSTOP kill ^%SYS(\"Journal\")\n" \
+                 "do ##class(Security.Users).UnExpireUserPasswords(\"*\")\n" \
+                 "halt" \
+    | iris session $ISC_PACKAGE_INSTANCENAME -U%SYS && \
+    iris stop $ISC_PACKAGE_INSTANCENAME quietly && \
+    rm $ISC_PACKAGE_INSTALLDIR/mgr/IRIS.WIJ && \
+    rm $ISC_PACKAGE_INSTALLDIR/mgr/journal/*
 
 VOLUME [ "/opt/blocks/db" ]
 

server/src/Blocks/Router.cls

@@ -6,6 +6,7 @@ Class Blocks.Router Extends %CSP.REST
 XData UrlMap
 {
 <Routes>
+    <Route Url="(?:/rest)?/websocket" Method="GET" Call="WebSocket"/>
     <Route Url="(?:/rest)?/dblist" Method="GET" Call="DBList"/>
     <Route Url="(?:/rest)?/ping" Method="GET" Call="Ping"/>
     <Route Url="(?:/rest)?/block/:block" Method="GET" Call="BlockInfo"/>
@@ -14,13 +15,10 @@ XData UrlMap
 </Routes>
 }
 
-ClassMethod OnPreDispatch(pUrl As %String, pMethod As %String, ByRef pContinue As %Boolean) As %Status
+ClassMethod WebSocket() As %Status
 {
-  if pUrl = "/websocket" {
-    set pContinue = 0
-    set %response.ServerSideRedirect = "/csp/blocks/Blocks.WebSocket.cls"
-  }
-  Quit $$$OK
+  Do ##class(%Library.Device).ReDirectIO(0)
+  Quit ##class(Blocks.WebSocket).Page(0)
 }
 
 ClassMethod outputJSON(data)