Merge pull request #89 from mdenet/20-add-token-server-to-compose

Added tokenserver to docker-compose
mdenet · Oct 13, 2023 · c17605a · c17605a
2 parents a434889 + 4d7002f
commit c17605a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/tokenserver/Dockerfile b/tokenserver/Dockerfile
@@ -0,0 +1,19 @@
+# syntax=docker/dockerfile:1
+
+FROM node:18.13-alpine
+
+# Create mdenet-ts directory
+WORKDIR /usr/src/mdenet-ts
+
+# Install app dependencies
+# A wildcard is used to ensure both package.json AND package-lock.json are copied
+# where available (npm@5+)
+COPY package*.json ./
+
+RUN npm install
+COPY  . .
+
+EXPOSE ${TS_PORT}
+
+CMD ["node", "-r", "dotenv/config", "dist/server.js"]
+
diff --git a/tokenserver/package.json b/tokenserver/package.json
@@ -15,12 +15,12 @@
     "cookie": "^0.5.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
+    "dotenv": "^16.3.1",
     "express": "^4.18.2",
     "octokit": "^2.0.14"
   },
   "devDependencies": {
     "@types/cookie": "^0.5.1",
-    "dotenv": "^16.0.3",
     "ts-loader": "^9.4.2",
     "typescript": "^5.0.3"
   }

diff --git a/tokenserver/src/config.js b/tokenserver/src/config.js
@@ -2,7 +2,7 @@
 
 export const config = {
 
-    port: process.env.PORT || "10000",
+    port: process.env.TS_PORT || "10000",
 
     endpointsPrefix: process.env.TS_ENDPOINT_PREFIX || "/mdenet-auth",