some updates

Author: daimor

Dockerfile.iris

@@ -8,16 +8,16 @@ RUN npm install \
   && export PATH="$PATH:./node_modules/.bin" \
   && webpack --mode production
 
-FROM store/intersystems/iris-community:2020.1.0.209.0
+FROM containers.intersystems.com/intersystems/iris-community:2020.3.0.200.0
 
 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/*
+    apt-get -y update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install imagemagick --no-install-recommends && \
+    rm -rf /var/lib/apt/lists/*
 
 USER irisowner
 

README.md

@@ -31,7 +31,7 @@ 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 \
+       -v `pwd`/out:/opt/blocks/out \
        daimor/blocksexplorer:cache generate
 ```
 
@@ -47,7 +47,7 @@ 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 \
+       -v `pwd`/out:/opt/blocks/out \
        daimor/blocksexplorer:iris generate
 ```
 

entrypoint.sh

@@ -24,7 +24,7 @@ if [ "${COMMAND,,}" = "generate" ]; then
     DATABASE=$1
     shift
   fi
-  OutputFolder=/out/
+  OutputFolder=/opt/blocks/out/
   CellSize=${1:-1}
   CellSpace=${2:-0}
   ShowFill=${3:-0}

web/Dockerfile

@@ -1,12 +1,12 @@
-FROM node:slim
+FROM node:12-slim
 
 # RUN apk update && apk add git
 
 WORKDIR /opt/app
 
 COPY package.json package-lock.json ./
 
-RUN npm ci
+RUN npm install
 
 ENV PATH="$PATH:./node_modules/.bin"