Update docker

Author: ar2rsawseen

Dockerfile

@@ -37,12 +37,16 @@ RUN apt-get update && apt-get install -y sudo && \
     mkdir /etc/service/nginx && \
     mkdir /etc/service/countly-api && \
     mkdir /etc/service/countly-dashboard && \
+    mkdir /etc/service/countly-ingestor && \
+    mkdir /etc/service/countly-aggregator && \
     echo "" >> /etc/nginx/nginx.conf && \
     echo "daemon off;" >> /etc/nginx/nginx.conf && \
     \
     cp /opt/countly/bin/commands/docker/mongodb.sh /etc/service/mongodb/run && \
     cp /opt/countly/bin/commands/docker/nginx.sh /etc/service/nginx/run && \
     cp /opt/countly/bin/commands/docker/countly-api.sh /etc/service/countly-api/run && \
+    cp /opt/countly/bin/commands/docker/countly-ingestor.sh /etc/service/countly-ingestor/run && \
+    cp /opt/countly/bin/commands/docker/countly-aggregator.sh /etc/service/countly-aggregator/run && \
     cp /opt/countly/bin/commands/docker/countly-dashboard.sh /etc/service/countly-dashboard/run && \
     \
     chown mongodb /etc/service/mongodb/run && \

Dockerfile-core

@@ -67,11 +67,15 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
     mkdir -p /etc/my_init.d && cp ./bin/docker/postinstall.sh /etc/my_init.d/ && \
     mkdir /etc/service/nginx && \
     mkdir /etc/service/countly-api && \
+    mkdir /etc/service/countly-ingestor && \
+    mkdir /etc/service/countly-aggregator && \
     mkdir /etc/service/countly-dashboard && \
     echo "" >> /etc/nginx/nginx.conf && \
     echo "daemon off;" >> /etc/nginx/nginx.conf && \
     cp ./bin/commands/docker/nginx.sh /etc/service/nginx/run && \
     cp ./bin/commands/docker/countly-api.sh /etc/service/countly-api/run && \
+    cp ./bin/commands/docker/countly-ingestor.sh /etc/service/countly-ingestor/run && \
+    cp ./bin/commands/docker/countly-aggregator.sh /etc/service/countly-aggregator/run && \
     cp ./bin/commands/docker/countly-dashboard.sh /etc/service/countly-dashboard/run && \
     chown -R countly:countly /opt/countly && \
     # cleanup

bin/commands/docker/countly-aggregator.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [ "$COUNTLY_MONGO_INSIDE" == "1" ]
+then
+	until mongo localhost --eval "db.stats()" | grep "collections"
+	do
+	    echo
+	    echo "[api] waiting for MongoDB to allocate files ..."
+	    sleep 1
+	done
+	sleep 3
+	echo "[api] MongoDB started"
+fi
+
+exec /sbin/setuser countly /usr/bin/nodejs /opt/countly/api/aggregator.js

bin/commands/docker/countly-ingestore.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+if [ "$COUNTLY_MONGO_INSIDE" == "1" ]
+then
+	until mongo localhost --eval "db.stats()" | grep "collections"
+	do
+	    echo
+	    echo "[api] waiting for MongoDB to allocate files ..."
+	    sleep 1
+	done
+	sleep 3
+	echo "[api] MongoDB started"
+fi
+
+exec /sbin/setuser countly /usr/bin/nodejs /opt/countly/api/ingestor.js

bin/config/nginx.server.block.conf

@@ -12,11 +12,19 @@ server {
         if ($http_content_type = "text/ping") {
              return 404;
         }
+		proxy_pass http://localhost:3010;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Real-IP $remote_addr;
+	}
 
-        proxy_pass http://localhost:3001;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Real-IP $remote_addr;
-    }
+	location = /i/bulk {
+        if ($http_content_type = "text/ping") {
+             return 404;
+        }
+		proxy_pass http://localhost:3010;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Real-IP $remote_addr;
+	}
 
     # Unblocked paths on API service
     #
@@ -30,7 +38,7 @@ server {
     # /o/surveys/nps/widget
     # /i/campaign/click/*
 
-    location ~ (/i/bulk|/o/sdk|/o/actions|/o/feedback/multiple-widgets-by-id|/o/feedback/widget|/o/surveys/survey/widget|/o/surveys/nps/widget|/i/campaign/click/*) {
+    location ~ (/o/sdk|/o/actions|/o/feedback/multiple-widgets-by-id|/o/feedback/widget|/o/surveys/survey/widget|/o/surveys/nps/widget|/i/campaign/click/*) {
         if ($http_content_type = "text/ping") {
              return 404;
         }

bin/config/nginx.server.ssl.conf

@@ -64,7 +64,16 @@ server {
         if ($http_content_type = "text/ping") {
              return 404;
         }
-		proxy_pass http://localhost:3001;
+		proxy_pass http://localhost:3010;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Real-IP $remote_addr;
+	}
+
+	location = /i/bulk {
+        if ($http_content_type = "text/ping") {
+             return 404;
+        }
+		proxy_pass http://localhost:3010;
 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 		proxy_set_header X-Real-IP $remote_addr;
 	}