Streamline Docker images

Server and prod images now have different tags so you don't have to rebuild when switching between them.

Author: mezzode

.dockerignore

@@ -1,2 +1 @@
 */node_modules
-# TODO: ignore stuff in web that doesn't belong in prod e.g. stories

database/Dockerfile

@@ -1,3 +1,7 @@
-FROM postgres:10.5-alpine
+FROM postgres:10.5-alpine as postgres
 
+FROM postgres AS prod
 COPY scripts/create.sql /docker-entrypoint-initdb.d
+
+FROM postgres AS dev
+COPY scripts/testData.sql /docker-entrypoint-initdb.d

database/dev.Dockerfile

@@ -1,5 +1,5 @@
 # dev config - automatically used for `docker-compose up`
-version: '3'
+version: '3.4'
 services:
     server:
         image: node:10.10.0-alpine
@@ -8,5 +8,6 @@ services:
         volumes:
             - ./server:/usr/src/app
     postgres:
+        image: cs4920-postgres:dev
         build:
-            dockerfile: ./dev.Dockerfile
+            target: dev

docker-compose.override.yml

@@ -1,8 +1,14 @@
 # prod config - `docker-compose -f docker-compose.yml -f docker-compose.prod.yml up`
-version: '3'
+version: '3.4'
 services:
     server:
+        image: cs4920-server:prod
         build:
             context: ./server
+            target: prod
         environment:
             NODE_ENV: 'production'
+    postgres:
+        image: cs4920-postgres:prod
+        build:
+            target: prod

docker-compose.prod.yml

@@ -1,7 +1,7 @@
 # this config does not work by itself, is extended by
 # `docker-compose.override.yml` for dev and
 # `docker-compose.prod.yml` for prod
-version: '3'
+version: '3.4'
 services:
     server:
         working_dir: /usr/src/app

docker-compose.yml

@@ -4,7 +4,7 @@
     "repository": "https://github.com/mezzode/cs4920-project.git",
     "license": "AGPL-3.0-or-later",
     "scripts": {
-        "start:prod": "docker-compose -f docker-compose.yml -f docker-compose.prod.yml up --build",
+        "start:prod": "docker-compose -f docker-compose.yml -f docker-compose.prod.yml up",
         "start": "docker-compose up"
     },
     "devDependencies": {

package.json

@@ -1,4 +1,6 @@
-FROM node:10.10.0-alpine
+FROM node:10.10.0-alpine AS node
+
+FROM node AS build
 
 WORKDIR /usr/src/app
 
@@ -8,4 +10,10 @@ RUN ls
 RUN yarn --no-progress
 RUN yarn build
 
-CMD ["node", "build/index.js"]
+FROM node AS prod
+
+WORKDIR /usr/src/app
+
+COPY --from=build /usr/src/app/build .
+
+CMD ["node", "index.js"]