From 990898d88e89f80925a6e100c2c4cb5ee89d1368 Mon Sep 17 00:00:00 2001
From: wodka <michael.schramm@gmail.com>
Date: Mon, 15 Jul 2019 16:30:35 +0200
Subject: [PATCH] remove logs and fixes for dockerfile

---
 .dockerignore                                 | 22 ++++++++++++++-----
 Dockerfile                                    |  8 +++++--
 app/sockets/analytics_service.js              |  5 -----
 .../docker-compose.yml => docker-compose.yml  |  8 ++++---
 4 files changed, 28 insertions(+), 15 deletions(-)
 rename docker/compose/docker-compose.yml => docker-compose.yml (84%)

diff --git a/.dockerignore b/.dockerignore
index 0bbf9fa8..f56202ae 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,20 @@
 .git
+.github
 .idea
-.vagrant
-coverage
-design
-e2e_coverage
-Vagrantfile
+data
+docker
+node_modules
+selenium
+.all-contributorsrc
+.csslintrc
+.editorconfig
+.env.example
+.gitignore
+.jshintrc
+.slugignore
+*.md
+conf.json
+docker-compose.yml
+Dockerfile
 Procfile
+protractor.conf.js
diff --git a/Dockerfile b/Dockerfile
index fb0f6e76..0dce360e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,9 @@ RUN apk add --no-cache git \
 	&& npm cache clean --force \
 	&& mkdir -p /opt/app/public/lib
 
+# to expose the public folder to other containers
+# VOLUME /opt/app
+
 WORKDIR /opt/app
 
 ## TODO: Find a method that's better than this for passing ENV's if possible.
@@ -38,9 +41,10 @@ ENV NODE_ENV=development \
     GOOGLE_ANALYTICS_ID="" \
     RAVEN_DSN=""
 
-COPY package.json bower.json .bowerrc app public config gruntfile.js server.js scripts ./
+# keep .dockerignore up to date
+COPY . .
 
-RUN npm install --only=production --quiet \
+RUN npm install --only=production \
     && bower install --allow-root -f \
     && grunt build
 
diff --git a/app/sockets/analytics_service.js b/app/sockets/analytics_service.js
index 2ed100ca..4f85dc4a 100644
--- a/app/sockets/analytics_service.js
+++ b/app/sockets/analytics_service.js
@@ -34,8 +34,6 @@ module.exports = function (io, socket) {
           throw new Error(errorHandler.getErrorMessage(err));
         }
 
-        console.log('update form to', form)
-
         if(cb){
           return cb();
         }
@@ -43,15 +41,12 @@ module.exports = function (io, socket) {
 	};
 
 	io.on('connection', function(current_socket) {
-	  console.log('CONNECTED CLIENT');
-
 		// a user has visited our page - add them to the visitorsData object
 		current_socket.on('form-visitor-data', function(data) {
 			visitorsData[current_socket.id] = data;
 			visitorsData[current_socket.id].socketId = current_socket.id;
 			visitorsData[current_socket.id].isSaved = false;
 
-			console.log('received data', data);
 			if (data.isSubmitted && !data.isSaved) {
 				visitorsData[current_socket.id].isSaved = true;
 				saveVisitorData(data, function() {
diff --git a/docker/compose/docker-compose.yml b/docker-compose.yml
similarity index 84%
rename from docker/compose/docker-compose.yml
rename to docker-compose.yml
index 93d8b35e..1782316f 100644
--- a/docker/compose/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,9 +8,10 @@ services:
     volumes:
       - "./data/mongo:/data"
   tellform:
-    build: .
-    volumes:
-      - ".:/opt/app"
+    image: ohmyform/ohmyform
+    #build: .
+    #volumes:
+    #  - ".:/opt/app"
     environment:
       CREATE_ADMIN: "TRUE"
       SOCKET_URL: 'localhost:5000'
@@ -20,6 +21,7 @@ services:
       REDIS_URL: redis://redis
       MAILER_SMTP_HOST: mail
       MAILER_SMTP_PORT: 1025
+    # command: grunt dev # override command to have livereloading on file change
     links:
       - mongo
       - redis