From b9c54d94706986c9b57e4ea2a50b268125d8733d Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 May 2020 14:33:27 +0200
Subject: [PATCH 1/4] Remove dev Dockerfile

- Service removed in docker-compose
---
 docker-compose.yml    |  8 --------
 docker/dev/Dockerfile | 23 -----------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 docker/dev/Dockerfile

diff --git a/docker-compose.yml b/docker-compose.yml
index 36c11b4..1a8c624 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,3 @@
 version: '3'
 
 services:
-  website-dev:
-    build:
-      context: ./
-      dockerfile: docker/dev/Dockerfile
-    volumes:
-      - ./client/src:/var/www/app
-    ports:
-      - 8080:8080
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
deleted file mode 100644
index e17e22c..0000000
--- a/docker/dev/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM node:lts-alpine
-
-# where the files live
-WORKDIR /app
-
-# get the sauce
-COPY /client/src/ /app/src/
-
-# add `/app/node_modules/.bin` to $PATH
-ENV PATH /app/node_modules/.bin:$PATH
-
-# make sure the packages are the same
-COPY /client/package-lock.json /app/package.json
-
-# install and cache app dependencies
-COPY /client/package.json /app/package.json
-RUN npm install
-
-# start app
-CMD ["npm", "run", "serve"]
-
-# allow to be peeked inside
-EXPOSE 8080

From df5359fad91808c9108b8e699eedc0b7c083476a Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 May 2020 15:41:34 +0200
Subject: [PATCH 2/4] Create Dockerfile for server in production

---
 server/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 server/Dockerfile

diff --git a/server/Dockerfile b/server/Dockerfile
new file mode 100644
index 0000000..e553cf9
--- /dev/null
+++ b/server/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:latest
+
+WORKDIR /usr/src/server
+
+COPY package*.json ./
+
+RUN npm ci --only=production
+
+COPY . .
+
+CMD [ "node", "index.js" ]
+
+EXPOSE 5000

From abd5f30d11c34606bf9be9d0a357b6f3890c04d7 Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 May 2020 16:04:55 +0200
Subject: [PATCH 3/4] Create Dockerfile for client in production - Including
 default nginx.conf for Vue.js

---
 client/Dockerfile | 11 +++++++++++
 client/nginx.conf | 30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 client/Dockerfile
 create mode 100644 client/nginx.conf

diff --git a/client/Dockerfile b/client/Dockerfile
new file mode 100644
index 0000000..c805f4a
--- /dev/null
+++ b/client/Dockerfile
@@ -0,0 +1,11 @@
+FROM node:latest as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY ./ .
+RUN npm run build
+
+FROM nginx as production-stage
+RUN mkdir /app
+COPY --from=build-stage /app/dist /app
+COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/client/nginx.conf b/client/nginx.conf
new file mode 100644
index 0000000..6f61d6c
--- /dev/null
+++ b/client/nginx.conf
@@ -0,0 +1,30 @@
+user  nginx;
+worker_processes  1;
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+events {
+  worker_connections  1024;
+}
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+  access_log  /var/log/nginx/access.log  main;
+  sendfile        on;
+  keepalive_timeout  65;
+  server {
+    listen       80;
+    server_name  localhost;
+    location / {
+      root   /app;
+      index  index.html;
+      try_files $uri $uri/ /index.html;
+    }
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+      root   /usr/share/nginx/html;
+    }
+  }
+}

From d5daf1ebf0f17dbf183e25244d5e64713166827e Mon Sep 17 00:00:00 2001
From: Raymonzut <40148684+Raymonzut@users.noreply.github.com>
Date: Mon, 11 May 2020 16:05:41 +0200
Subject: [PATCH 4/4] Add .dockerignore for client and server

---
 client/.dockerignore | 2 ++
 server/.dockerignore | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 client/.dockerignore
 create mode 100644 server/.dockerignore

diff --git a/client/.dockerignore b/client/.dockerignore
new file mode 100644
index 0000000..e0a57b2
--- /dev/null
+++ b/client/.dockerignore
@@ -0,0 +1,2 @@
+**/node_modules
+**/dist
diff --git a/server/.dockerignore b/server/.dockerignore
new file mode 100644
index 0000000..e0a57b2
--- /dev/null
+++ b/server/.dockerignore
@@ -0,0 +1,2 @@
+**/node_modules
+**/dist