Optimise docker builds

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "git.ignoreLimitWarning": true
+  "git.ignoreLimitWarning": true,
+  "python.pythonPath": "/Users/tim/.pyenv/versions/3.7.7/bin/python"
 }

client/.devcontainer.json

@@ -3,7 +3,7 @@
   "dockerComposeFile": [
     "../docker-compose.yml"
   ],
-  "service": "patientor-frontend",
+  "service": "patientor",
   // keep container running after vs code closes to prevent accidentally shutting down both
   // containers if closing either client or server vscode window
   "shutdownAction": "none",
@@ -12,7 +12,7 @@
     "esbenp.prettier-vscode"
   ],
   // Open the sub-folder with the source code
-  "workspaceFolder": "/patientor-client",
+  "workspaceFolder": "/patientor",
   "postCreateCommand": "npm install",
   "forwardPorts": [3000]
 }

client/Dockerfile

@@ -1,7 +1,5 @@
-FROM ubuntu
+FROM node:10-alpine
 ARG apiurl
-WORKDIR /patientor-client
-RUN apt-get update && apt-get install -y curl
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash
-RUN apt-get install -y nodejs
+WORKDIR /patientor
 COPY . .
+EXPOSE 3000

client/package.json

@@ -50,5 +50,5 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://patientor-backend:3001"
+  "proxy": "http://patientor-api:3001"
 }

docker-compose.yml

@@ -1,18 +1,18 @@
 version: '3'
 
 services:
-  patientor-backend:
+  patientor-api:
     build:
       context: ./server
-      dockerfile: ./server/dev.Dockerfile
-    image: patientor-backend
+      dockerfile: ./dev.Dockerfile
+    image: patientor-api:alpine-dev
     ports:
       - 3001
     environment:
       - REDIS_HOST=redis
     depends_on:
       - redis
-    container_name: patientor-server
+    container_name: patientor-api
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
   redis:
@@ -21,12 +21,12 @@ services:
       - redis:/data
     command: ["redis-server", "--appendonly", "yes"]
     container_name: patientor-db
-  patientor-frontend:
+  patientor:
     build: ./client
-    image: patientor-frontend
+    image: patientor
     ports:
       - 3000
-    container_name: patientor-client
+    container_name: patientor
     command: sleep infinity
 
 volumes:

server/.devcontainer.json

@@ -1,9 +1,9 @@
 {
   "name": "Patientor Server",
   "dockerComposeFile": ["../docker-compose.yml"],
-  "service": "patientor-backend",
+  "service": "patientor-api",
   "shutdownAction": "none",
-  "workspaceFolder": "/patientor-server",
+  "workspaceFolder": "/patientor-api",
   "extensions": [
     "dbaeumer.vscode-eslint",
     "esbenp.prettier-vscode"

server/dev.Dockerfile

@@ -1,11 +1,6 @@
-FROM ubuntu
+FROM node:10-alpine
 
-RUN apt-get update && apt-get install -y curl && \
-    curl -sL https://deb.nodesource.com/setup_12.x | bash && \
-    apt-get install -y nodejs && \
-    apt-get purge -y --autoremove curl
-
-WORKDIR /app
+WORKDIR /patientor-api
 COPY . .
 
 EXPOSE 3001