Dockerise application

.Dockerignore

@@ -0,0 +1,2 @@
+node_modules
+data

.babelrc

@@ -1,19 +1,19 @@
-{
-  "plugins": [
-    "source-map-support",
-    ["@babel/plugin-proposal-decorators", { "legacy": true }],
-    ["@babel/plugin-proposal-class-properties", { "loose" : true }],
-    ["@babel/plugin-proposal-private-methods", { "loose" : true }]
-  ],
-  "presets": [
-    "@babel/typescript",
-    [
-      "@babel/preset-env",
-      {
-        "targets": {
-          "node": true
-        }
-      }
-    ]
-  ]
+{
+  "plugins": [
+    "source-map-support",
+    ["@babel/plugin-proposal-decorators", { "legacy": true }],
+    ["@babel/plugin-proposal-class-properties", { "loose" : true }],
+    ["@babel/plugin-proposal-private-methods", { "loose" : true }]
+  ],
+  "presets": [
+    "@babel/typescript",
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": true
+        }
+      }
+    ]
+  ]
 }

.env

@@ -11,4 +11,4 @@ GOOGLE_OAUTH_CALLBACK_URL=http://localhost:3000/api/v1/auth/google/callback
 JWT_SECRET=[Insert Key here]
 ACCESS_TOKEN_TTL=1d
 ACCESS_TOKEN_TTL_IN_SEC=86400
-REFRESH_TOKEN_TTL_IN_SEC=5184000
+REFRESH_TOKEN_TTL_IN_SEC=5184000

.gitignore

@@ -2,10 +2,12 @@
 node_modules
 jspm_packages
 data/database.sqlite
+data/.database.built
 
 # serverless
 .serverless
 .webpack
 .env
+.env.local
 .env.localdev
 .env.localdev.local

Dockerfile

@@ -0,0 +1,15 @@
+FROM node:14.17
+
+WORKDIR /app/
+
+COPY package-lock.json package.json serverless.yml ./
+
+RUN npm i
+
+COPY . .
+
+COPY docker/docker-entrypoint.sh /scripts/docker-entrypoint.sh
+
+RUN chmod 755 /scripts/docker-entrypoint.sh
+
+ENTRYPOINT ["sh", "/scripts/docker-entrypoint.sh"]

Makefile

@@ -1,4 +1,17 @@
-reset-db:
-	npm run 
-import-db:
+all: down clean-db build up
+
+clean-db:
+	npm run db:clean
+	rm data/.database.built || true
+
+build:
+	docker-compose build --force mbo_backend
+
+up: 
+	docker-compose up
+
+down:
+	docker-compose down
+
+import-db:
 	npm run typeorm schema:sync

README.md

@@ -1,9 +1,12 @@
 # MBO Backend
-This is the backend repository for multiplied by one
+This is the backend repository for multiplied by one. The project requires either `docker` + `docker-compose` or node v14 on the host machine.
 
-To get started run
+To get started run. (You will need to run this when updating files outside of src / installing new packakges)
 ```bash
-npm i
-npm run db:create
-npm run start
+make all
+```
+
+Then to start the running containers run.
+```bash
+make start
 ```

docker-compose.yml

@@ -0,0 +1,18 @@
+version: '3.8'
+
+services:
+  mbo_backend:
+    build:
+      context: .
+    ports:
+      - "3000:3000"
+    container_name: "mbo_backend"
+    volumes:
+      - './package.json:/app/package.json'
+      - './serverless.yml:/app/serverless.yml'
+      - './package-lock.json:/app/yarn.lock'
+      - './src/:/app/src/'
+      - './data/:/app/data/'
+      - './.env:/app/.env'
+      - './.env.localdev:/app/.env.localdev'
+      - './.env.localdev.local:/app/.env.localdev.local'

docker/docker-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+cd /app
+
+if [ ! -f /app/data/.database.built ]; then
+    echo "Creating db..."
+    npm run db:create
+    npm run fixtures
+    touch /app/data/.database.built
+fi
+
+npm run start

fixtures/EyeAccount.yml

@@ -1,4 +1,4 @@
-entity: EyeAccount
-items:
-  eyeAccount{1..10}:
+entity: EyeAccount
+items:
+  eyeAccount{1..10}:
     user: '@user{1..5}'

fixtures/Eyebox.yml

@@ -1,8 +1,8 @@
-entity: Eyebox
-items:
-  eyeBox{1..10}:
-    subjectLine: 'Subject Title'
-    tStamp: '{{date.past}}'
-    messageBody: '{{lorem.sentence}}'
-    sender: '@eyeAccount{1..10}'
+entity: Eyebox
+items:
+  eyeBox{1..10}:
+    subjectLine: 'Subject Title'
+    tStamp: '{{date.past}}'
+    messageBody: '{{lorem.sentence}}'
+    sender: '@eyeAccount{1..10}'
     receiver: '@eyeAccount{1..10}'

fixtures/Headmate.yml

@@ -1,8 +1,8 @@
-entity: Headmate
-items:
-  headmate{1..10}:
-    hName: ($current)
-    user: '@user{1..5}'
-    eyeAccounts:
-      - '@eyeAccount{1..5}'
+entity: Headmate
+items:
+  headmate{1..10}:
+    hName: ($current)
+    user: '@user{1..5}'
+    eyeAccounts:
+      - '@eyeAccount{1..5}'
       - '@eyeAccount{6..10}'

fixtures/Journal.yml

@@ -1,4 +1,4 @@
-entity: Journal
-items:
-  journal{1..10}:
+entity: Journal
+items:
+  journal{1..10}:
     eyeAccount: '@eyeAccount{1..10}'

fixtures/JournalEntry.yml

@@ -1,7 +1,7 @@
-entity: JournalEntry
-items:
-  journalEntry{1..10}:
-    tStamp: '{{date.past}}'
-    etitle: 'Journal entry title ($current)'
-    ebody: '{{lorem.text}}'
+entity: JournalEntry
+items:
+  journalEntry{1..10}:
+    tStamp: '{{date.past}}'
+    etitle: 'Journal entry title ($current)'
+    ebody: '{{lorem.text}}'
     journal: '@journal{1..10}'

fixtures/Meeting.yml

@@ -1,5 +1,5 @@
-entity: Meeting
-items:
-  meeting{1..10}:
-    datetime: '{{date.past}}'
+entity: Meeting
+items:
+  meeting{1..10}:
+    datetime: '{{date.past}}'
     meetingSpace: '@meetingSpace{1..10}'

fixtures/MeetingEntry.yml

@@ -1,7 +1,7 @@
-entity: MeetingEntry
-items:
-  meetingEntry{1..10}:
-    meeting: '@meeting{1..10}'
-    headmate: '@headmate{1..10}'
-    tStamp: '{{date.past}}'
+entity: MeetingEntry
+items:
+  meetingEntry{1..10}:
+    meeting: '@meeting{1..10}'
+    headmate: '@headmate{1..10}'
+    tStamp: '{{date.past}}'
     mbody: '{{lorem.text}}'

fixtures/MeetingSpace.yml

@@ -1,4 +1,4 @@
-entity: MeetingSpace
-items:
-  meetingSpace{1..10}:
+entity: MeetingSpace
+items:
+  meetingSpace{1..10}:
     user: '@user{1..5}'

fixtures/Reminders.yml

@@ -1,8 +1,8 @@
-entity: Reminders
-items:
-  reminder{1..10}:
-    assignee: '@user{1..5}'
-    headmate: '@headmate{1..10}'
-    time: '{{date.past}}'
-    message: '{{lorem.sentence}}'
+entity: Reminders
+items:
+  reminder{1..10}:
+    assignee: '@user{1..5}'
+    headmate: '@headmate{1..10}'
+    time: '{{date.past}}'
+    message: '{{lorem.sentence}}'
     completion: false

fixtures/User.yml

@@ -1,5 +1,5 @@
-entity: User
-items:
-  user{1..5}:
-    googleAccountId: ($current*100000)
+entity: User
+items:
+  user{1..5}:
+    googleAccountId: ($current*100000)
     emailAddress: '{{internet.email}}'