Merge pull request #5 from daimor/new

New cli generator

Author: daimor

.github/workflows/main.yaml

@@ -0,0 +1,22 @@
+name: CI
+on:
+  - push
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        variant: [
+          "cache",
+          "iris"
+        ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Login to Docker Registry
+        run: docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push
+        run: make ${{ matrix.variant }}

.gitignore

@@ -2,4 +2,4 @@ node_modules
 dist
 /temp/
 build
-.vscode
+out

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "objectscript.conn": {
+    "active": true,
+    "ns": "BLOCKS",
+    "docker-compose": {
+      "service": "server"
+    }
+  }
+}

Dockerfile

@@ -1,4 +1,4 @@
-ARG CACHE_VERSION=2017.2
+ARG CACHE_VERSION=2018.1
 FROM node:8-alpine AS web
 
 WORKDIR /opt/blocks/
@@ -13,6 +13,8 @@ FROM daimor/intersystems-cache:${CACHE_VERSION}
 
 WORKDIR /opt/blocks
 
+RUN yum -y install ImageMagick
+
 COPY ./server/src/ ./src
 COPY --from=web /opt/blocks/build/ /usr/cachesys/csp/blocks/
 
@@ -27,3 +29,7 @@ RUN ccontrol start $ISC_PACKAGE_INSTANCENAME quietly \
  && ccontrol stop $ISC_PACKAGE_INSTANCENAME quietly
 
 VOLUME [ "/opt/blocks/db" ]
+
+COPY entrypoint.sh /
+
+ENTRYPOINT [ "/entrypoint.sh" ]

Dockerfile.iris

@@ -1,4 +1,3 @@
-ARG IRIS_VERSION=2018.1
 FROM node:8-alpine AS web
 
 WORKDIR /opt/blocks/
@@ -9,9 +8,18 @@ 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.209.0
 
-WORKDIR /opt/blocks/
+WORKDIR /opt/blocks
+
+USER root
+
+RUN chown ${ISC_PACKAGE_MGRUSER}:${ISC_PACKAGE_IRISGROUP} ${PWD} && \
+ apt-get -y update && \
+ DEBIAN_FRONTEND=noninteractive apt-get -y install imagemagick --no-install-recommends && \
+ rm -rf /var/lib/apt/lists/*
+
+USER irisowner
 
 COPY ./server/src/ ./src
 COPY --from=web /opt/blocks/build/ /usr/irissys/csp/blocks/
@@ -25,3 +33,7 @@ RUN iris start $ISC_PACKAGE_INSTANCENAME quietly \
   && iris stop $ISC_PACKAGE_INSTANCENAME quietly
 
 VOLUME [ "/opt/blocks/db" ]
+
+COPY entrypoint.sh /
+
+ENTRYPOINT [ "/entrypoint.sh" ]

README.md

@@ -1,5 +1,5 @@
-# Caché Blocks Explorer
-Database Blocks Explorer for InterSystems Caché
+# Blocks Explorer
+Database Blocks Explorer for InterSystems IRIS/Caché
 
 #### Key features
 ##### Tree explorer
@@ -19,20 +19,43 @@ Database Blocks Explorer for InterSystems Caché
 You need license key for Caché or IRIS on RedHat systems.
 ##### Caché
 ```
-docker run -d --name cacheblocksexplorer --rm \
-       -p 52773:52773 \
+docker run -d --name blocksexplorer --rm \
+       -p 57772:57772 \
+       -v /opt/some/database/for/test:/opt/blocks/db/test \
+       -v ~/cache.key:/usr/cachesys/mgr/cache.key \
+       daimor/blocksexplorer:cache
+```
+Generate blocks map as image file in `out` directory
+```
+docker run -it --rm \
        -v /opt/some/database/for/test:/opt/blocks/db/test \
-       -v ~/cache.key:/usr/cachesys/mgr/cache.key
-       daimor/cacheblocksexplorer:cache
+       -v `pwd`out:/opt/blocks/out \
+       daimor/blocksexplorer:cache generate
 ```
+
 ##### IRIS
 ```
-docker run -d --name cacheblocksexplorer --rm \
-       -p 57772:57772 \
+docker run -d --name blocksexplorer --rm \
+       -p 52773:52773 \
        -v /opt/some/database/for/test:/opt/blocks/db/test \
-       -v ~/iris.key:/usr/irissys/mgr/iris.key
-       daimor/cacheblocksexplorer:iris
+       daimor/blocksexplorer:iris
+```
+
+Generate blocks map as image file in `out` directory
+```
+docker run -it --rm \
+       -v /opt/some/database/for/test:/opt/blocks/db/test \
+       -v `pwd`out:/opt/blocks/out \
+       daimor/blocksexplorer:iris generate
+```
+
+
+#### Development mode
+Run with docker-compose, will start web part with hot reloading.
+```
+docker-compose up -d
 ```
+By default running on 80 port. To start using it, just open http://localhost/
 
 ## Screenshots
 

docker-compose.cache.yml

@@ -0,0 +1,17 @@
+version: "2.4"
+
+services:
+  server:
+    build:
+      context: server
+      args:
+        CACHE_VERSION: ${CACHE_VERSION-2018.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,18 @@
-version: "3"
+version: "2.4"
 
 services:
   server:
     build:
       context: server
       dockerfile: Dockerfile.iris
       args:
-        IRIS_VERSION: ${IRIS_VERSION-2018.1}
+        IRIS_VERSION: 2020.1.0.209.0
     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,22 @@
-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"
+    extends:
+      file: docker-compose.${MODE:-iris}.yml
+      service: server
     volumes:
-      - ~/cache.key:/usr/cachesys/mgr/cache.key
-      - ./server/src:/opt/blocks/src
+      - ./out:/opt/blocks/out
   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}"

entrypoint.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+if [ "$#" -lt 1 ]; then
+  # just start server
+  if [ -f /iris-main ]; then
+    /iris-main
+  else
+    /ccontainermain
+  fi
+  exit
+fi
+
+COMMAND=$1
+if [ -x "$(command -v ccontrol)" ]; then
+  CCONTROL=ccontrol
+else
+  CCONTROL=iris
+fi
+
+if [ "${COMMAND,,}" = "generate" ]; then
+  shift
+  re='^[0-9]+$'
+  if ! [[ "$1" =~ $re ]]; then
+    DATABASE=$1
+    shift
+  fi
+  OutputFolder=/out/
+  CellSize=${1:-1}
+  CellSpace=${2:-0}
+  ShowFill=${3:-0}
+  DATABASE=${DATABASE:-/db}
+
+  echo
+  echo "Starting server..."
+  $CCONTROL start $ISC_PACKAGE_INSTANCENAME quietly
+  echo
+  echo "Generating image..."
+  echo "Database = \"$DATABASE\""
+  echo "OutputFolder = \"$OutputFolder\""
+  echo "CellSize = $CellSize"
+  echo "CellSpace = $CellSpace"
+  echo "ShowFill = $ShowFill"
+  rm ${OutputFolder}BlocksMap.{png,bmp}
+  $CCONTROL session $ISC_PACKAGE_INSTANCENAME -UBLOCKS "##class(Blocks.BlocksMap).Generate(\"$DATABASE\",\"${OutputFolder}\",\"${CellSize}\",\"${CellSpace}\",\"${ShowFill}\")"
+  echo
+  echo "Stopping server..."
+  $CCONTROL stop $ISC_PACKAGE_INSTANCENAME quietly
+  echo "Finished"
+else
+  /bin/echo -e "" \
+  "Available commands:\n\n" \
+  "  help      - this help\n" \
+  "  generate  - will generate BlocksMap for the database located in /opt/blocks/db/test/\n" \
+  "              as an image in bmp and png format in folder /opt/blocks/out\n"
+  "              \n"
+fi