Merge branch 'fix-audit' into 'master'

Fix audit

See merge request uxf/vnc-hybridauth2!17

.gitlab-ci.yml

@@ -39,12 +39,11 @@ deb:
   only:
     - master
 
-dev_deploy:  
+dev_deploy:
   before_script:
     - base64 -d $SA_Development | docker login -u _json_key --password-stdin https://eu.gcr.io
   stage: docker
   script:
-    - cd docker
     - docker build -t $IMAGE_TAG .
     - docker push $IMAGE_TAG
   only:

Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine:3.16
+
+RUN apk update
+RUN apk add make gcc python3 expat-static expat-dev libxmlb-dev libstdc++6 nodejs nodejs-dev libc-dev g++ libpq libpq-dev yarn
+# RUN yarn install -g serve
+RUN yarn global add pm2
+
+RUN mkdir -p /usr/share/vnctalk-hybrid-authenticator2
+RUN mkdir -p /usr/share/vnctalk-hybrid-authenticator2/config
+ADD app /usr/share/vnctalk-hybrid-authenticator2/app
+
+COPY package.json /usr/share/vnctalk-hybrid-authenticator2/package.json
+COPY yarn.lock /usr/share/vnctalk-hybrid-authenticator2/yarn.lock
+COPY docker/config.js /usr/share/vnctalk-hybrid-authenticator2/config/vnc-hybrid-authenticator.js
+
+RUN cd /usr/share/vnctalk-hybrid-authenticator2 && yarn install
+
+#RUN npm install /usr/share/vnctalk-hybrid-authenticator2/app
+
+ENTRYPOINT ["pm2-runtime", "/usr/share/vnctalk-hybrid-authenticator2/app/app.js"]

docker/Dockerfile

@@ -1,15 +0,0 @@
-FROM  eu.gcr.io/vnc-development/docker-vnc-base:latest
-
-RUN apt-get update
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get install -y nodejs
-RUN apt-get install -y build-essential
-RUN npm install -g serve
-RUN npm install pm2 -g
-
-RUN apt-get install -y vnctalk-hybrid-authenticator2
-COPY config.js /usr/share/vnctalk-hybrid-authenticator2/config/vnc-hybrid-authenticator.js
-
-#RUN npm install /usr/share/vnctalk-hybrid-authenticator2/app
-
-ENTRYPOINT ["pm2-runtime", "/usr/share/vnctalk-hybrid-authenticator2/app/app.js"]

package.json

@@ -11,18 +11,18 @@
   "author": "VNC Software AG",
   "license": "",
   "dependencies": {
-    "body-parser": "1.18.3",
-    "express": "4.13.4",
+    "body-parser": "1.20.0",
+    "express": "4.18.1",
     "express-async-errors": "3.1.1",
-    "express-basic-auth": "1.1.6",
+    "express-basic-auth": "1.2.1",
     "hmacsha1": "1.0.0",
-    "jsonwebtoken": "8.3.0",
+    "jsonwebtoken": "8.5.1",
     "ldapjs": "^1.0.2",
-    "md5": "2.2.1",
-    "moment": "2.22.2",
-    "morgan": "1.8.2",
-    "pg": "^8.7.1",
-    "pg-pool": "^3.4.1",
-    "request": "2.83.0"
+    "md5": "2.3.0",
+    "moment": "2.29.4",
+    "morgan": "1.10.0",
+    "pg": "8.8.0",
+    "pg-pool": "3.5.2",
+    "request": "2.88.2"
   }
 }