Switch to node user

Author: swederik

Dockerfile

@@ -1,37 +1,24 @@
 # docker build -t ohif/dicomweb-server:latest .
 # docker run -p 5985:5985 ohif/dicomweb-server:latest
 # If you want to use PouchDB in this container, add -p 5984:5984
-# docker run -p 5985:5985 -p 5984:5984 -e USE_POUCHDB=true ohif/dicomweb-server:latest
+# docker run -p 5985:5985 -p 5984:5984 -e USE_POUCHDB=true -e DB_SERVER=http://0.0.0.0 ohif/dicomweb-server:latest
 FROM node:13.10.1-slim
 
 # Install prerequisites
 RUN apt-get update
-RUN apt-get -y install git-core \
-	supervisor
+RUN apt-get -y install supervisor
 
-# Grab Source
-RUN mkdir /usr/src/app
-WORKDIR /usr/src/app
-ADD . /usr/src/app
+USER node
+RUN mkdir -p /home/node/app
+RUN mkdir -p /home/node/log/supervisor
+WORKDIR /home/node/app
+ADD . /home/node/app
 
 # Restore deps
 RUN npm ci
-RUN npm install pouchdb-server
-
-# Override config
-COPY ./dockersupport/server-config.js config/development.js
-
-# Copy the scripts to run dicomweb-server and PouchDB
-COPY ./dockersupport/dicomweb-server-service.sh /usr/src/dicomweb-server-service.sh
-RUN chmod 777 /usr/src/dicomweb-server-service.sh
-
-COPY ./dockersupport/conditionally-start-pouchdb.sh /usr/src/conditionally-start-pouchdb.sh
-RUN chmod 777 /usr/src/conditionally-start-pouchdb.sh
+RUN npm install [email protected]
 
 ENV USE_POUCHDB=false
 
-# Setup Supervisord
-COPY ./dockersupport/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
 EXPOSE 5984 5985
-CMD ["supervisord", "-n"]
+CMD ["supervisord", "-n", "-c", "/home/node/app/dockersupport/supervisord.conf"]

docker-compose.yml

@@ -15,6 +15,7 @@ services:
     hostname: dicomweb-server
     environment:
       - PORT=5984
+      - DB_SERVER=http://couchdb
     ports:
       - '5985:5985'
     depends_on:
@@ -29,6 +30,9 @@ services:
     hostname: couchdb
     volumes:
       - ./couchdb-data:/opt/couchdb/data
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=password
     ports:
       - '5984:5984'
     restart: unless-stopped

dockersupport/conditionally-start-pouchdb.sh

@@ -3,7 +3,7 @@
 if [ $USE_POUCHDB = "true" ]
 then
     echo "USE_POUCHDB is true, starting PouchDB service"
-    /usr/src/app/node_modules/pouchdb-server/bin/pouchdb-server --in-memory --host 0.0.0.0
+    /home/node/app/node_modules/pouchdb-server/bin/pouchdb-server --in-memory --host 0.0.0.0
 else
     exit 0
 fi

dockersupport/dicomweb-server-service.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-cd /usr/src/app
+cd /home/node/app
 npm start

dockersupport/server-config.js

@@ -1,14 +1,16 @@
 [supervisord]
+user=node
+logfile=/home/node/log/supervisor/supervisord.log
 nodaemon=true
 
 [program:pouchdb]
-command=bash /usr/src/conditionally-start-pouchdb.sh
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s.log
+command=bash /home/node/app/dockersupport/conditionally-start-pouchdb.sh
+stdout_logfile=/home/node/log/supervisor/%(program_name)s.log
+stderr_logfile=/home/node/log/supervisor/%(program_name)s.log
 autorestart=true
 
 [program:dicomweb-server]
-command=bash /usr/src/dicomweb-server-service.sh
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-stderr_logfile=/var/log/supervisor/%(program_name)s.log
+command=bash /home/node/app/dockersupport/dicomweb-server-service.sh
+stdout_logfile=/home/node/log/supervisor/%(program_name)s.log
+stderr_logfile=/home/node/log/supervisor/%(program_name)s.log
 autorestart=true