Revert "Revert "Merge pull request Countly#1056 from Countly/feature/…

…new-whale"" This reverts commit 76882ff.
pnrgenc · Sep 26, 2019 · 0061a83 · 0061a83
1 parent d8f7a32
commit 0061a83
Show file tree

Hide file tree

Showing 27 changed files with 955 additions and 811 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 .git
 .github
-.DS_Store
+.DS_Store
+.Dockerfile*
diff --git a/.eslintignore b/.eslintignore
@@ -5,11 +5,11 @@ frontend/express/public/javascripts/min/**
 frontend/express/public/javascripts/utils/**
 frontend/express/public/javascripts/visualization/**
 frontend/express/public/themes/**
+frontend/express/public/sdk/**
 plugins/*/frontend/public/*
 plugins/*/frontend/public/javascripts/*
 bin/scripts/nghttp2/*
 plugins/push/api/parts/apn/*
 
 !plugins/*/frontend/public/javascripts
-!plugins/*/frontend/public/javascripts/countly.models.js
-!plugins/*/frontend/public/javascripts/countly.views.js
+!plugins/*/frontend/public/javascripts/countly.*.js
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -194,7 +194,8 @@
                 "frontend/express/libs/*.js",
                 "plugins/pluginManager.js",
                 "plugins/*/api/**/*.js",
-                "plugins/*/frontend/*.js"
+                "plugins/*/frontend/*.js",
+                "plugins/*/extend/*.js"
             ],
             "env": {
                 "es6": true,

diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: nodejs
 dist: trusty
-node_js: "8"
+node_js: "10"
 env:
   global:
-  - MONGODB=3.6.6
+  - MONGODB=4.0.12
   - secure: ZXdUMP+8Nk9Kd5nX31D/DIB1t2xlJd+T4W7umWjwpy+KPA9d1W1OhUG6V2Gpv3PsJf+UtMosgZsywcLFVG4l/WcjAhs3c9pegW5ZRYAEfVjkk7aHhWQGvj5DID8iAAxs91Mm8LwJ43o68x+XN6746zArPqcVzQltDunJ0G3gfh8=
 branches:
   except:

diff --git a/bin/scripts/detect.init.sh b/bin/scripts/detect.init.sh
@@ -5,13 +5,15 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 # use available init system
 INITSYS="systemd"
 
-if [ "$INSIDE_DOCKER" = "1" ]
+if [ -z "$COUNTLY_CONTAINER" ]
 then
+	if [[ `/sbin/init --version` =~ upstart ]];
+	then
+	    INITSYS="upstart"
+	fi 2> /dev/null
+else
 	INITSYS="docker" 
-elif [[ `/sbin/init --version` =~ upstart ]];
-then
-    INITSYS="upstart"
-fi 2> /dev/null
+fi
 
 bash $DIR/commands/$INITSYS/install.sh
 ln -sf $DIR/commands/$INITSYS/countly.sh $DIR/commands/enabled/countly.sh