From 879f4cdac06bc489df7929d6a7cddd9eac2eb9e0 Mon Sep 17 00:00:00 2001
From: rozetko <rozetko@corpglory.com>
Date: Wed, 21 Nov 2018 17:23:22 +0300
Subject: [PATCH] Add git info to Docker #238 (#257)

---
 .dockerignore           | 4 ++++
 analytics/.dockerignore | 3 ---
 docker-compose.yml      | 4 +++-
 server/.dockerignore    | 1 -
 server/Dockerfile       | 7 ++-----
 5 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..fe7375b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+*
+!.git/HEAD
+!.git/refs
+!server
diff --git a/analytics/.dockerignore b/analytics/.dockerignore
index ce5fca2..f53d18e 100644
--- a/analytics/.dockerignore
+++ b/analytics/.dockerignore
@@ -1,5 +1,2 @@
-.git
-npm-debug
-node_modules
 __pycache__
 .vscode
diff --git a/docker-compose.yml b/docker-compose.yml
index eb9742b..17b6caa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,9 @@ version: '2'
 services:
   server:
     image: hastic/server:latest
-    build: server
+    build: 
+      dockerfile: server/Dockerfile
+      context: .
     environment:
       HASTIC_API_KEY: ${HASTIC_API_KEY}
       ZMQ_CONNECTION_STRING: ${ZMQ_CONNECTION_STRING}
diff --git a/server/.dockerignore b/server/.dockerignore
index cf23c6e..7f6a6c7 100644
--- a/server/.dockerignore
+++ b/server/.dockerignore
@@ -1,4 +1,3 @@
-.git
 node_modules
 npm-debug
 .vscode
diff --git a/server/Dockerfile b/server/Dockerfile
index ff47b00..f19b4f4 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -11,14 +11,11 @@ RUN apt-get install curl \
 
 VOLUME [ "/var/www/data" ]
 
-WORKDIR /var/www/server
+COPY . /var/www
 
-COPY package.json /var/www/server
+WORKDIR /var/www/server
 
 RUN npm install
-
-COPY . /var/www/server
-
 RUN npm run build
 
 ENV INSIDE_DOCKER true