Merge branch 'develop' into dependabot/npm_and_yarn/jsonwebtoken-9.0.0

.github/workflows/test-build.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.x]
 
     steps:
       - name: Checkout code

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "peacock.color": "#2f0710"
-}
+  "peacock.color": "#2f0710",
+  "prettier.singleQuote": false
+}

CI/ESS/Dockerfile

@@ -1,23 +1,25 @@
-FROM node:16-alpine
+FROM node:20-alpine
 
 ENV NODE_ENV="production"
 ENV PORT=3012
 EXPOSE 3012
 
-ENV http_proxy "http://172.18.12.30:8123"
-ENV https_proxy $http_proxy
+#ENV http_proxy "http://172.18.12.30:8123"
+#ENV https_proxy $http_proxy
 RUN apk update && apk upgrade
 
 WORKDIR /home/node/app
 COPY package*.json /home/node/app/
 COPY .snyk /home/node/app/
 
-RUN npm config set proxy  $http_proxy
-RUN npm config set https-proxy  $http_proxy
+#RUN npm config set proxy  $http_proxy
+#RUN npm config set https-proxy  $http_proxy
 RUN npm ci
 
 COPY . .
-COPY CI/ESS/local.config.json src/
+COPY test/config.json.test config/config.json
+RUN mkdir files
+
 
 RUN npm run build
 

CI/ESS/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:18-alpine
 
 RUN apk update && apk upgrade
 

CI/ESS/docker-compose.yml

@@ -1,12 +1,15 @@
 version: "3"
 services:
   node:
-    build: .
-    restart: always
+    image: docker pull ghcr.io/scicatproject/zip-service:alpha.1
+    restart: no
     ports:
       - "3012:3012"
     volumes:
-      - /nfs/groups/beamlines/:/nfs/groups/beamlines
-      - /users/detector/experiments/:/users/detector/experiments
-      - /mnt/groupdata/guide_optimizations/:/mnt/groupdata/guide_optimizations
-      - /tmp/zip-service:/home/node/app/files #location of the zipped files
+      - /ess/sims/config/zip-service/config.json:/home/node/app/config.json
+      - /tmp/zip-service:/home/node/app/files
+      - /users/detector/experiments/:/users/detector/experiments:ro
+      - /nfs/groups/beamlines/:/nfs/groups/beamlines:ro
+      - /mnt/groupdata/guide_optimizations/:/mnt/groupdata/guide_optimizations:ro
+      - /ess/data:/ess/data:ro
+

CI/ESS/local.config.json

@@ -9,5 +9,9 @@
     "jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJncm91cHMiOlsiZXNzIiwibG9raSIsIm9kaW4iXSwiaWF0IjoxNTY3NDI3NzA5LCJleHAiOjE1Njc0MzEzMDl9.ENcuTBS67shghefL3wRCHxoyobwZGaFQIUvSZ0cywcE",
     "directory": "/nfs/groups/beamlines/v20/14CD3N/",
     "files": ["nicos_00000490.hdf"]
-  }
+  },
+  "graylogEnabled": true,
+  "graylogServer": "it-graylog.esss.lu.se",
+  "graylogPort": 12201,
+  "environment": "development"
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16-alpine
+FROM node:18-alpine
 
 RUN apk update && apk upgrade
 

config/config.json

@@ -0,0 +1,17 @@
+{
+  "zipDir": "./files",
+  "jwtSecret": "fhjekrsgvhuirs",
+  "sessionSecret": "fj9832mnsaf3j9adsa",
+  "facility": "ess",
+  "zipRetentionMillis": 3600000,
+  "dramDirectory": "/nfs/groups/beamlines/dram",
+  "testData": {
+    "jwt": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJncm91cHMiOlsiZXNzIiwibG9raSIsIm9kaW4iXSwiaWF0IjoxNTY3NDI3NzA5LCJleHAiOjE1Njc0MzEzMDl9.ENcuTBS67shghefL3wRCHxoyobwZGaFQIUvSZ0cywcE",
+    "directory": "./test/",
+    "files": ["test_file_1.txt"]
+  },
+  "graylogEnabled": false,
+  "graylogServer": "it-graylog.esss.lu.se",
+  "graylogPort": 12201,
+  "environment": "development"
+}