Setup docker based deployment

Author: callmekatootie

app.js

@@ -14,9 +14,21 @@ const cors = require('cors')
 const logger = require('./src/common/logger')
 const HttpStatus = require('http-status-codes')
 
+const buildEnvironments = ['production', 'staging']
+
 // setup express app
 const app = express()
 
+app.enable('trust proxy')
+
+function forceSSL (req, res, next) {
+  if (!req.secure && req.get('x-forwarded-proto') !== 'https' && buildEnvironments.includes(process.env.NODE_ENV)) {
+    return res.redirect('https://' + req.get('host') + req.url)
+  }
+  next()
+}
+
+app.use(forceSSL)
 app.use(cors())
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: true }))

client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "u-bahn-app",
+  "name": "u-bahn-app-fe",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

docker/Dockerfile

@@ -2,11 +2,12 @@
 FROM node:12
 
 # Copy the current directory into the Docker image
-COPY . /ubahn_search_ui_api
+COPY . /ubahn_app
 
 # Set working directory for future use
-WORKDIR /ubahn_search_ui_api
+WORKDIR /ubahn_app
 
 # Install the dependencies from package.json
 RUN npm install
+RUN npm run install-client
 CMD npm start

docker/docker-compose.yml

@@ -1,11 +1,11 @@
 version: '3'
 services:
-  ubahn_search_ui_api:
-    image: ubahn_search_ui_api:latest
+  ubahn_app:
+    image: ubahn_app:latest
     build:
       context: ../
       dockerfile: docker/Dockerfile
     env_file:
       - api.env
     ports:
-      - "3001:3001"
+      - "3000:3000"

docker/sample.api.env

@@ -1,16 +1,26 @@
 API_VERSION=
-AUTH_SECRET=
-VALID_ISSUERS=
-AUTH0_URL=
 AUTH0_AUDIENCE=
-TOKEN_CACHE_TIME=
-AUTH0_CLIENT_ID=
 AUTH0_CLIENT_SECRET=
-UPLOAD_CREATE_TOPIC=
+AUTH0_CLIENT_ID=
+AUTH0_PROXY_SERVER_URL=
+AUTH0_URL=
+AUTH_SECRET=
 AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
 AWS_REGION=
-TEMPLATE_S3_BUCKET=
-UPLOAD_S3_BUCKET=
+AWS_SECRET_ACCESS_KEY=
 EMSI_CLIENT_ID=
 EMSI_CLIENT_SECRET=
+NODE_ENV=
+REACT_APP_API_PREFIX=
+REACT_APP_API_URL=
+REACT_APP_AUTH0_AUDIENCE=
+REACT_APP_AUTH0_CLIENTID=
+REACT_APP_AUTH0_DOMAIN=
+REACT_APP_BULK_UPLOAD_TEMPLATE_ID=
+REACT_APP_EMSI_SKILLPROVIDER_ID=
+REACT_APP_GROUPS_API_URL=
+TEMPLATE_S3_BUCKET=
+TOKEN_CACHE_TIME=
+UPLOAD_CREATE_TOPIC=
+UPLOAD_S3_BUCKET=
+VALID_ISSUERS=

package.json

@@ -1,9 +1,10 @@
 {
-  "name": "ubahn-search-ui-api",
+  "name": "ubahn-app",
   "version": "1.0.0",
   "description": "UBahn search ui api",
   "main": "app.js",
   "scripts": {
+    "install-client": "cd client && npm install && cd ..",
     "client": "cd client && npm start",
     "start": "node app.js",
     "dev": "concurrently --kill-others-on-fail \"npm start\" \"cd client && npm start\"",

src/routes.js

@@ -75,7 +75,7 @@ module.exports = {
       scopes: [constants.Scopes.GetSkill, constants.Scopes.AllSkill]
     }
   },
-  '/ubahnsearchapi/health': {
+  '/health': {
     get: {
       controller: 'HealthCheckController',
       method: 'check'