WIP: Needs to be tested

Author: sofiaromorales

dockerfiles/Dockerfile-api Dockerfile-api

@@ -16,6 +16,6 @@ RUN npm install
 # copy project files
 COPY . .
 
-EXPOSE 80 443
+EXPOSE 8080
 STOPSIGNAL SIGTERM
 CMD [ "node", "server.js" ]

Dockerfile-combined

@@ -0,0 +1,21 @@
+FROM node:14
+
+# set environment variables
+ENV APP=/usr/src/app
+
+# where the code lives
+WORKDIR $APP
+
+# 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 project files
+COPY . .
+
+EXPOSE 8080
+STOPSIGNAL SIGTERM
+CMD [ "npm", "build" ]

Dockerfile-deploy.yml

@@ -0,0 +1,17 @@
+services:
+  backend:
+    env_file:
+        './.env'
+    build:
+      context: .
+      dockerfile: ./Dockerfile-api
+    image: ''
+    ports:
+      - '8080'
+  frontend:
+    build:
+      context: .
+      dockerfile: ./Dockerfile-ui
+    image: ''
+    ports:
+      - '6002'

dockerfiles/Dockerfile-ui Dockerfile-ui

@@ -11,6 +11,8 @@ WORKDIR $APP
 # where available (npm@5+)
 COPY package*.json ./
 
+COPY .env .
+
 RUN npm install
 
 # copy project
@@ -20,10 +22,7 @@ COPY . .
 # variables in place at build time so we make sure our workflow files take care of
 # populating this file with the correct values
 
-# Copy environment file generated by CI (GitHub Actions)
-COPY .env .
-RUN npm run build
 
-EXPOSE 3000
+EXPOSE 6002
 STOPSIGNAL SIGTERM
-CMD ["npm", "start"]
+CMD ["npm", "ui"]