Reduce images size

.ci/privatebuild/Dockerfile

@@ -68,11 +68,11 @@ ENV NODE_ENV=production
 
 COPY --from=dependencies /var/app/ /var/app/
 
-RUN  ln -s /var/app/docker-compose/scripts/run.sh /usr/local/bin/kuzzle \
+RUN  ln -s /var/app/docker/scripts/run.sh /usr/local/bin/kuzzle \
   && chmod a+x /usr/local/bin/kuzzle \
-  && chmod a+x /var/app/docker-compose/scripts/docker-entrypoint.sh
+  && chmod a+x /var/app/docker/scripts/docker-entrypoint.sh
 
-ENTRYPOINT ["/var/app/docker-compose/scripts/docker-entrypoint.sh"]
+ENTRYPOINT ["/var/app/docker/scripts/docker-entrypoint.sh"]
 
 CMD ["kuzzle", "start"]
 

.ci/scripts/install-plugins.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+set -e
+set -x
+
 working_dir=$(pwd)
 plugins_dir="plugins/enabled"
 protocols_dir="protocols/enabled"

.ci/scripts/run-test-arm.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
 set -e
-
-elastic_host=${kuzzle_services__storageEngine__client__node:-http://elasticsearch:9200}
+set -x
 
 NODE_VERSION=$NODE_12_VERSION
 
@@ -12,33 +11,10 @@ export NVM_DIR="$HOME/.nvm"
 . "$NVM_DIR/nvm.sh"
 nvm use $NODE_VERSION
 
-
-echo "[$(date --rfc-3339 seconds)] - Waiting for elasticsearch to be available"
-while ! curl -f -s -o /dev/null "$elastic_host"
-do
-    echo "[$(date --rfc-3339 seconds)] - Still trying to connect to $elastic_host"
-    sleep 1
-done
-# create a tmp index just to force the shards to init
-echo "[$(date --rfc-3339 seconds)] - Elasticsearch is up. Waiting for shards to be active (can take a while)"
-E=$(curl -s "$elastic_host/_cluster/health?wait_for_status=yellow&timeout=60s")
-
-if ! (echo ${E} | grep -E '"status":"(yellow|green)"' > /dev/null); then
-    echo "============ Cluster health response"
-    echo $E
-    echo "============ Cluster allocation explanation"
-    curl -s http://$elastic_host/_cluster/allocation/explain?pretty
-    echo "[$(date --rfc-3339 seconds)] - Could not connect to elasticsearch in time. Aborting..."
-    exit 1
-fi
-
 node bin/start-kuzzle-server --enable-plugins functional-test-plugin &
 
-echo "[$(date --rfc-3339 seconds)] - Starting Kuzzle..."
-while ! curl -f -s -o /dev/null http://localhost:7512
-do
-    echo "[$(date --rfc-3339 seconds)] - Still trying to connect to Kuzzle"
-    sleep 1
-done
+echo "[$(date)] - Starting Kuzzle..."
+
+./bin/wait-kuzzle
 
 npm run test:functional

.ci/scripts/run-test.sh

@@ -1,57 +1,21 @@
 #!/bin/sh
 
 set -e
-
-elastic_host=${kuzzle_services__storageEngine__client__node:-http://elasticsearch:9200}
+set -x
 
 NODE_VERSION=$NODE_12_VERSION
 
 echo "Testing Kuzzle against node v$NODE_VERSION"
 n $NODE_VERSION
 
 npm install --silent --unsafe-perm
-npm install --silent --unsafe-perm --only=dev
-chmod -R 777 node_modules/
-docker-compose/scripts/install-plugins.sh
-
-echo "[$(date --rfc-3339 seconds)] - Waiting for elasticsearch to be available"
-spinner="/"
-while ! curl -f -s -o /dev/null "$elastic_host"
-do
-    printf '\r'
-    echo -n "[$(date --rfc-3339 seconds)] - Still trying to connect to $elastic_host [$spinner]"
-    if [ "$spinner" = "/" ]; then spinner="\\";  else spinner="/" ; fi
-    sleep 1
-done
-# create a tmp index just to force the shards to init
-echo "[$(date --rfc-3339 seconds)] - Elasticsearch is up. Waiting for shards to be active (can take a while)"
-E=$(curl -s "$elastic_host/_cluster/health?wait_for_status=yellow&timeout=60s")
-
-if ! (echo ${E} | grep -E '"status":"(yellow|green)"' > /dev/null); then
-    echo "============ Cluster health response"
-    echo $E
-    echo "============ Cluster allocation explanation"
-    curl -s http://$elastic_host/_cluster/allocation/explain?pretty
-    echo "[$(date --rfc-3339 seconds)] - Could not connect to elasticsearch in time. Aborting..."
-    exit 1
-fi
 
-node bin/start-kuzzle-server --enable-plugins functional-test-plugin &
+./docker/scripts/install-plugins.sh
 
-echo "[$(date --rfc-3339 seconds)] - Starting Kuzzle..."
-timeout=$((20 * 60))
-while ! curl -f -s -o /dev/null http://localhost:7512
-do
-    printf '\r'
-    echo -n "[$(date --rfc-3339 seconds)] - Still trying to connect to Kuzzle [$spinner]"
-    if [ "$spinner" = "/" ]; then spinner="\\";  else spinner="/" ; fi
+echo "[$(date)] - Starting Kuzzle..."
 
-    timeout=$((timeout - 1))
-    if [ $timeout -eq 0 ]; then
-        echo "[$(date --rfc-3339 seconds)] - Timeout"
-    fi
+node bin/start-kuzzle-server --enable-plugins functional-test-plugin &
 
-    sleep 1
-done
+./bin/wait-kuzzle
 
-npm run test:functional
+npm run $KUZZLE_FUNCTIONAL_TESTS

.ci/test-aarch64.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   kuzzle:
     image: kuzzleio/core-dev-aarch64:2
-    command: sh -c 'chmod 755 /run-test-arm.sh && /run-test-arm.sh'
+    command: /run-test-arm.sh
     volumes:
       - "..:/var/app"
       - "./scripts/run-test-arm.sh:/run-test-arm.sh"
@@ -21,7 +21,7 @@ services:
       - kuzzle_server__protocols__mqtt__enabled=true
       - kuzzle_server__protocols__mqtt__developmentMode=false
       - kuzzle_limits__loginsPerSecond=50
-      - NODE_ENV=production
+      - NODE_ENV=development
       - DEBUG=
       - KUZZLE_SECRETS_FILE=/var/app/features-sdk/fixtures/secrets.enc.json
       - KUZZLE_VAULT_KEY=secret-password

.ci/test-armhf.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   kuzzle:
     image: kuzzleio/core-dev-armhf:2
-    command: sh -c 'chmod 755 /run-test-arm.sh && /run-test-arm.sh'
+    command: /run-test-arm.sh
     volumes:
       - "..:/var/app"
       - "./scripts/run-test-arm.sh:/run-test-arm.sh"
@@ -21,7 +21,7 @@ services:
       - kuzzle_server__protocols__mqtt__enabled=true
       - kuzzle_server__protocols__mqtt__developmentMode=false
       - kuzzle_limits__loginsPerSecond=50
-      - NODE_ENV=production
+      - NODE_ENV=development
       - DEBUG=
       - KUZZLE_SECRETS_FILE=/var/app/features-sdk/fixtures/secrets.enc.json
       - KUZZLE_VAULT_KEY=secret-password

.ci/test.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   kuzzle:
     image: kuzzleio/core-dev:2
-    command: sh -c 'chmod 755 /run-test.sh && /run-test.sh'
+    command: /run-test.sh
     volumes:
       - "..:/var/app"
       - "./scripts/run-test.sh:/run-test.sh"
@@ -27,10 +27,11 @@ services:
       - kuzzle_limits__loginsPerSecond=50
       - kuzzle_server__protocols__mqtt__enabled=true
       - kuzzle_server__protocols__mqtt__developmentMode=false
-      - NODE_ENV=production
+      - NODE_ENV=development
       - DEBUG
       - KUZZLE_SECRETS_FILE=/var/app/features-sdk/fixtures/secrets.enc.json
       - KUZZLE_VAULT_KEY=secret-password
+      - KUZZLE_FUNCTIONAL_TESTS=${KUZZLE_FUNCTIONAL_TESTS:-test:functional}
       # Travis env var must be propagated into the container
       - TRAVIS
       - TRAVIS_COMMIT

.dockerignore

@@ -1,10 +1,10 @@
 **/node_modules
 dump
 index-dump
-vagrant
+vagrant/
 Vagrantfile
 **/.git
-/.ci
+.ci
 .idea
 .nyc_output
 .sonar
@@ -13,3 +13,7 @@ sonar-project.properties
 plugins/available/functional-test-plugin
 plugins/enabled/functional-test-plugin
 plugins/enabled/dummy
+
+.git/
+**Dockerfile
+doc/

.travis.yml

@@ -118,10 +118,19 @@ jobs:
     # ---------------------------------------
     - <<: *integration-tests
       stage: Integration tests
-      name: Node.js 12
+      name: Node.js 12 - Functional tests legacy
       env:
+        - KUZZLE_FUNCTIONAL_TESTS=test:functional:legacy
         - *integration-tests-env
 
+    - <<: *integration-tests
+      stage: Integration tests
+      name: Node.js 12 - Functional tests sdk
+      env:
+        - KUZZLE_FUNCTIONAL_TESTS=test:functional:sdk
+        - *integration-tests-env
+
+
     # ---------------------------------------
     # Cross-platform tests
     # ---------------------------------------
@@ -175,7 +184,7 @@ jobs:
       language: minimal
       services: docker
       script:
-        - MODE=production bash build-docker-images.sh
+        - MODE=production bash docker/build-docker-images.sh
 
     - <<: *doc-deploy
       name: Documentation to next-docs.kuzzle.io

CONTRIBUTING.md

@@ -24,7 +24,7 @@ We use most of the [NPM Coding Style](https://docs.npmjs.com/misc/coding-style)
 
 ## Tools
 
-For development only, we built a specific docker-compose file: `docker-compose/dev.yml`. You can use it to profile, debug, test a variable on the fly, add breakpoints and so on, thanks to [chrome-devtools](https://developer.chrome.com/devtools).  
+For development only, we built a specific docker-compose file: `docker-compose.yml`. You can use it to profile, debug, test a variable on the fly, add breakpoints and so on, thanks to [chrome-devtools](https://developer.chrome.com/devtools).  
 Check the logs at the start of Kuzzle using the development docker image to get the appropriate debug URL.
 
 How to run the development stack (needs Docker 1.10+ and Docker Compose 1.8+):
@@ -52,14 +52,14 @@ Everytime a modification is detected in the source files, the server is automati
 
 The development stack include a endpoint to access Kuzzle API through SSL on port `7443`.  
 
-The certificates are privately signed, using provided [CA certificate](docker-compose/nginx/kuzzleCA.crt).  
+The certificates are privately signed, using provided [CA certificate](docker/nginx/kuzzleCA.crt).  
 Domains accepted:
 - localhost
 - *.kuzzle.loc
 
 You'll need to import the CA certificate to your browser and possibly your system local authorities to make it verified.
 Once done, your browser should not complain when reaching https://localhost:7443.  
-The CA certificate is here: [docker-compose/nginx/kuzzleCA.crt](docker-compose/nginx/kuzzleCA.crt)
+The CA certificate is here: [docker/nginx/kuzzleCA.crt](docker/nginx/kuzzleCA.crt)
 
 Using node.js, for instance when using the sdk, you'll need to pass the CA cert using the `NODE_EXTRA_CA_CERTS` environment variable: