From 316db11e89cb3b40d2af48097494658a82825df6 Mon Sep 17 00:00:00 2001
From: Richard Stanley <2528387+citizenrich@users.noreply.github.com>
Date: Thu, 27 Feb 2020 16:04:50 -0500
Subject: [PATCH] fix docker, update for ui

---
 .dockerignore        |  2 ++
 .gitignore           |  5 ++++-
 Dockerfile           | 10 ++++++++++
 dockerhub.sh         |  8 ++++++++
 server/.dockerignore |  2 --
 server/Dockerfile    | 12 ------------
 server/dockerhub.sh  |  8 --------
 ui/.dockerignore     |  2 --
 ui/Dockerfile        | 12 ------------
 ui/dockerhub.sh      |  8 --------
 10 files changed, 24 insertions(+), 45 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile
 create mode 100644 dockerhub.sh
 delete mode 100644 server/.dockerignore
 delete mode 100644 server/Dockerfile
 delete mode 100644 server/dockerhub.sh
 delete mode 100644 ui/.dockerignore
 delete mode 100644 ui/Dockerfile
 delete mode 100644 ui/dockerhub.sh

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..44f76bf5
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+# modified configs
+config_development.json
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3e41ba53..7a5bb6cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,7 @@ config_development.json
 .vscode
 
 # ipynb
-*.ipynb_checkpoints
\ No newline at end of file
+*.ipynb_checkpoints
+
+# macos
+*.DS_Store
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..7c906633
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:dubnium
+
+RUN mkdir -p /var/log
+COPY . /src/
+WORKDIR /src/server
+RUN /bin/bash -c 'cp config/config_development_template.json config_development.json'
+RUN npm install
+
+EXPOSE 3000
+CMD ["node", "lib/app.js"]
\ No newline at end of file
diff --git a/dockerhub.sh b/dockerhub.sh
new file mode 100644
index 00000000..8b222ad7
--- /dev/null
+++ b/dockerhub.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -ex
+
+# automate tagging with the short commit hash
+docker build --no-cache -t intrahealth/opencr:$(git rev-parse --short HEAD) .
+docker tag intrahealth/opencr:$(git rev-parse --short HEAD) intrahealth/opencr
+docker push intrahealth/opencr:$(git rev-parse --short HEAD)
+docker push intrahealth/opencr:latest
\ No newline at end of file
diff --git a/server/.dockerignore b/server/.dockerignore
deleted file mode 100644
index 88f8efb5..00000000
--- a/server/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# modified configs
-config_development.json
diff --git a/server/Dockerfile b/server/Dockerfile
deleted file mode 100644
index c76cc9ae..00000000
--- a/server/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node:dubnium
-
-# install dependencies
-ADD package-lock.json /src/
-ADD package.json /src/
-WORKDIR /src/
-RUN npm install
-
-# add app
-ADD . /src/
-
-CMD ["node", "lib/app.js"]
\ No newline at end of file
diff --git a/server/dockerhub.sh b/server/dockerhub.sh
deleted file mode 100644
index cc7667f6..00000000
--- a/server/dockerhub.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# automate tagging with the short commit hash
-docker build --no-cache -t intrahealth/opencr-service:$(git rev-parse --short HEAD) .
-docker tag intrahealth/opencr-service:$(git rev-parse --short HEAD) intrahealth/opencr-service
-docker push intrahealth/opencr-service:$(git rev-parse --short HEAD)
-docker push intrahealth/opencr-service:latest
\ No newline at end of file
diff --git a/ui/.dockerignore b/ui/.dockerignore
deleted file mode 100644
index 88f8efb5..00000000
--- a/ui/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# modified configs
-config_development.json
diff --git a/ui/Dockerfile b/ui/Dockerfile
deleted file mode 100644
index c76cc9ae..00000000
--- a/ui/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM node:dubnium
-
-# install dependencies
-ADD package-lock.json /src/
-ADD package.json /src/
-WORKDIR /src/
-RUN npm install
-
-# add app
-ADD . /src/
-
-CMD ["node", "lib/app.js"]
\ No newline at end of file
diff --git a/ui/dockerhub.sh b/ui/dockerhub.sh
deleted file mode 100644
index 88edd14a..00000000
--- a/ui/dockerhub.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-# automate tagging with the short commit hash
-docker build --no-cache -t intrahealth/opencr-ux:$(git rev-parse --short HEAD) .
-docker tag intrahealth/opencr-ux:$(git rev-parse --short HEAD) intrahealth/opencr-ux
-docker push intrahealth/opencr-ux:$(git rev-parse --short HEAD)
-docker push intrahealth/opencr-ux:latest
\ No newline at end of file