fix: update dependencies, switch to alpine

.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"]

config.js

@@ -0,0 +1,59 @@
+module.exports = {
+  development: {
+    servicePort: 9544,
+    domain: process.env.domain || 'dev.vnc.de',
+    xmppToken: process.env.xmppToken || 'xah6niighohshieKahtah',
+    useRedmineAuth: true,
+    ldap: {
+      ldapUri: process.env.ldapUri || 'none',
+      bindDn: process.env.bindDn || 'uid=zimbra,cn=admins,cn=zimbra',
+      bindPassword: process.env.bindPassword || 'none',
+      searchBase: process.env.searchBase || 'none',
+      filter: process.env.filter || '(objectClass=inetOrgPerson)',
+      config: 100,
+      // valid ldapType for now: MS-AD, zimbra
+      ldapType: process.env.ldapType || 'zimbra'
+    },
+    database: {
+      host: process.env.databaseHost || "127.0.0.1",
+      port: process.env.databasePort || 54322,
+      name: process.env.databaseName || "redmine",
+      user: process.env.databaseUser || "redmine",
+      pass: process.env.databasePass || "redmine",
+      idleTimeoutMillis: 10000,
+      connectionTimeoutMillis: 10000
+    },
+    redminedb: {
+      host: process.env.redmineDbHost || "127.0.0.1",
+      port: process.env.redmineDbPort || 54322,
+      name: process.env.redmineDbName || "redmine",
+      user: process.env.redmineDbUser || "redmine",
+      pass: process.env.redmineDbPass || "redmine",
+      idleTimeoutMillis: 10000,
+      connectionTimeoutMillis: 10000
+    }
+  },
+  gr13: {
+    servicePort: 9544,
+    xmppToken: process.env.xmppToken || 'ocu8saithoYa2teeb2ahTh9fee4is7ai',
+    ldap: {
+      ldapUri: process.env.ldapUri || 'ldap://192.168.21.142:389',
+      bindDn: process.env.bindDn || 'uid=zimbra,cn=admins,cn=zimbra',
+      bindPassword: process.env.bindPassword || 'jSVNIcRSRR',
+      searchBase: process.env.searchBase || 'ou=people,dc=dev,dc=local,dc=gr13,dc=net',
+      filter: process.env.filter || '(objectClass=inetOrgPerson)',
+      config: 100,
+      // valid ldapType for now: MS-AD, zimbra
+      ldapType: process.env.ldapType || 'zimbra'
+    },
+    database : {
+      host: process.env.prosodyDbHost || "192.168.21.143",
+      port: process.env.prosodyDbPort || 5432,
+      name: process.env.prosodyDbName || "prosody",
+      user: process.env.prosodyDbUser || "prosody",
+      pass: process.env.prosodyDbPass || "vahG7ooli7thee0iek4Ewoo9Sai6oWah",
+      idleTimeoutMillis: 10000,
+      connectionTimeoutMillis: 10000
+    }
+  },
+};

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"
   }
 }