Merge pull request #36 from brendantwh/containerize

Containerize user service
CS3219-AY2425S1 · Oct 6, 2024 · 8478c94 · 8478c94
2 parents cbae288 + 06254c3
commit 8478c94
Show file tree

Hide file tree

Showing 2,241 changed files with 344 additions and 349,116 deletions.
diff --git a/...e/node_modules/sparse-bitfield/.npmignore → backend/user-service/.dockerignore b/...e/node_modules/sparse-bitfield/.npmignore → backend/user-service/.dockerignore
@@ -1 +1,2 @@
 node_modules
+.env
diff --git a/user-service/.env → backend/user-service/.env b/user-service/.env → backend/user-service/.env
diff --git a/user-service/.env.sample → backend/user-service/.env.sample b/user-service/.env.sample → backend/user-service/.env.sample
diff --git a/backend/user-service/.gitignore b/backend/user-service/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/backend/user-service/Dockerfile.prod b/backend/user-service/Dockerfile.prod
@@ -0,0 +1,13 @@
+FROM node:22-alpine3.19 AS builder
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+RUN npm ci
+COPY . .
+
+ENV HOSTNAME="0.0.0.0"
+ENV PORT=3001
+
+EXPOSE 3001
+
+CMD ["npm", "start"]
diff --git a/user-service/GuideAssets/AddIPAddress.png → ...user-service/GuideAssets/AddIPAddress.png b/user-service/GuideAssets/AddIPAddress.png → ...user-service/GuideAssets/AddIPAddress.png
diff --git a/user-service/GuideAssets/ConnectCluster.png → ...er-service/GuideAssets/ConnectCluster.png b/user-service/GuideAssets/ConnectCluster.png → ...er-service/GuideAssets/ConnectCluster.png
diff --git a/...-service/GuideAssets/ConnectionString.png → ...-service/GuideAssets/ConnectionString.png b/...-service/GuideAssets/ConnectionString.png → ...-service/GuideAssets/ConnectionString.png
diff --git a/user-service/GuideAssets/Creation.png → ...end/user-service/GuideAssets/Creation.png b/user-service/GuideAssets/Creation.png → ...end/user-service/GuideAssets/Creation.png
diff --git a/user-service/GuideAssets/DriverSelection.png → ...r-service/GuideAssets/DriverSelection.png b/user-service/GuideAssets/DriverSelection.png → ...r-service/GuideAssets/DriverSelection.png
diff --git a/user-service/GuideAssets/IPWhitelisting.png → ...er-service/GuideAssets/IPWhitelisting.png b/user-service/GuideAssets/IPWhitelisting.png → ...er-service/GuideAssets/IPWhitelisting.png
diff --git a/user-service/GuideAssets/Network.png → backend/user-service/GuideAssets/Network.png b/user-service/GuideAssets/Network.png → backend/user-service/GuideAssets/Network.png
diff --git a/user-service/GuideAssets/Security.png → ...end/user-service/GuideAssets/Security.png b/user-service/GuideAssets/Security.png → ...end/user-service/GuideAssets/Security.png
diff --git a/user-service/GuideAssets/Selection.png → ...nd/user-service/GuideAssets/Selection.png b/user-service/GuideAssets/Selection.png → ...nd/user-service/GuideAssets/Selection.png
diff --git a/user-service/GuideAssets/Selection1.png → ...d/user-service/GuideAssets/Selection1.png b/user-service/GuideAssets/Selection1.png → ...d/user-service/GuideAssets/Selection1.png
diff --git a/user-service/GuideAssets/Selection2.png → ...d/user-service/GuideAssets/Selection2.png b/user-service/GuideAssets/Selection2.png → ...d/user-service/GuideAssets/Selection2.png
diff --git a/user-service/GuideAssets/Selection3.png → ...d/user-service/GuideAssets/Selection3.png b/user-service/GuideAssets/Selection3.png → ...d/user-service/GuideAssets/Selection3.png
diff --git a/user-service/GuideAssets/Selection4.png → ...d/user-service/GuideAssets/Selection4.png b/user-service/GuideAssets/Selection4.png → ...d/user-service/GuideAssets/Selection4.png
diff --git a/user-service/GuideAssets/SidePane.png → ...end/user-service/GuideAssets/SidePane.png b/user-service/GuideAssets/SidePane.png → ...end/user-service/GuideAssets/SidePane.png
diff --git a/user-service/MongoDBSetup.md → backend/user-service/MongoDBSetup.md b/user-service/MongoDBSetup.md → backend/user-service/MongoDBSetup.md
diff --git a/user-service/README.md → backend/user-service/README.md b/user-service/README.md → backend/user-service/README.md
diff --git a/user-service/controller/auth-controller.js → ...ser-service/controller/auth-controller.js b/user-service/controller/auth-controller.js → ...ser-service/controller/auth-controller.js
diff --git a/user-service/controller/user-controller.js → ...ser-service/controller/user-controller.js b/user-service/controller/user-controller.js → ...ser-service/controller/user-controller.js
diff --git a/user-service/index.js → backend/user-service/index.js b/user-service/index.js → backend/user-service/index.js
diff --git a/...ervice/middleware/basic-access-control.js → ...ervice/middleware/basic-access-control.js b/...ervice/middleware/basic-access-control.js → ...ervice/middleware/basic-access-control.js
diff --git a/user-service/model/repository.js → backend/user-service/model/repository.js b/user-service/model/repository.js → backend/user-service/model/repository.js
diff --git a/user-service/model/user-model.js → backend/user-service/model/user-model.js b/user-service/model/user-model.js → backend/user-service/model/user-model.js
diff --git a/user-service/package-lock.json → backend/user-service/package-lock.json b/user-service/package-lock.json → backend/user-service/package-lock.json
diff --git a/user-service/package.json → backend/user-service/package.json b/user-service/package.json → backend/user-service/package.json
diff --git a/user-service/routes/auth-routes.js → backend/user-service/routes/auth-routes.js b/user-service/routes/auth-routes.js → backend/user-service/routes/auth-routes.js
diff --git a/user-service/routes/user-routes.js → backend/user-service/routes/user-routes.js b/user-service/routes/user-routes.js → backend/user-service/routes/user-routes.js
diff --git a/user-service/server.js → backend/user-service/server.js b/user-service/server.js → backend/user-service/server.js
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,8 +5,6 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile.dev
-    # depends_on:
-    #   - 
     ports:
       - "3000:3000"
     develop:
@@ -19,12 +17,19 @@ services:
     build:
       context: ./backend/question-service
       dockerfile: Dockerfile.dev
-    # depends_on:
-    #   - 
     ports:
       - "2000:2000"
     develop:
       watch:
         - action: sync
           path: ./backend/question-service
           target: /app
+
+  user:
+    build:
+      context: ./backend/user-service
+      dockerfile: Dockerfile.prod
+    env_file:
+      - ./backend/user-service/.env
+    ports:
+      - "3001:3001"
diff --git a/user-service/node_modules/.bin/color-support b/user-service/node_modules/.bin/color-support
diff --git a/user-service/node_modules/.bin/mime b/user-service/node_modules/.bin/mime
diff --git a/user-service/node_modules/.bin/mkdirp b/user-service/node_modules/.bin/mkdirp
diff --git a/user-service/node_modules/.bin/node-pre-gyp b/user-service/node_modules/.bin/node-pre-gyp
diff --git a/user-service/node_modules/.bin/nodemon b/user-service/node_modules/.bin/nodemon
diff --git a/user-service/node_modules/.bin/nodetouch b/user-service/node_modules/.bin/nodetouch
diff --git a/user-service/node_modules/.bin/nopt b/user-service/node_modules/.bin/nopt
diff --git a/user-service/node_modules/.bin/rimraf b/user-service/node_modules/.bin/rimraf
diff --git a/user-service/node_modules/.bin/semver b/user-service/node_modules/.bin/semver