Nit

.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/run-test.sh

@@ -10,48 +10,11 @@ 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
+./docker/scripts/install-plugins.sh
 
 node bin/start-kuzzle-server --enable-plugins functional-test-plugin &
 
-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
-
-    timeout=$((timeout - 1))
-    if [ $timeout -eq 0 ]; then
-        echo "[$(date --rfc-3339 seconds)] - Timeout"
-    fi
-
-    sleep 1
-done
+echo "[$(date)] - Starting Kuzzle..."
 
 npm run test:functional

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:
 

docker/images/kuzzle.alpine/Dockerfile

@@ -5,7 +5,6 @@ FROM node:12.16.3-alpine3.11 as builder
 
 ADD ./bin /var/app/bin
 ADD ./config /var/app/config
-ADD ./docker /var/app/docker
 
 ADD ./lib /var/app/lib
 
@@ -23,7 +22,8 @@ WORKDIR /var/app
 
 ENV NODE_ENV=production
 
-RUN  apk add --no-cache \
+RUN  set -x \
+  && apk add --no-cache \
       curl \
       python \
       make \
@@ -66,7 +66,8 @@ FROM node:12.16.3-alpine3.11 as minifier
 
 COPY --from=builder /var/app /var/app
 
-RUN  apk add --no-cache \
+RUN  set -x \
+  && apk add --no-cache \
         xz \
         binutils \
   && strip /usr/local/bin/node \
@@ -86,11 +87,12 @@ LABEL description="Run your Kuzzle backend in production mode"
 ENV NODE_ENV=production
 
 ADD ./docker/scripts/promises.sh /promises.sh
+ADD ./docker/scripts/entrypoint.sh /bin/entrypoint
+ADD ./docker/scripts/extract.sh /bin/extract
+ADD ./docker/scripts/run.sh /bin/kuzzle
+
 COPY --from=minifier /lib.tar.xz /everest/lib.tar.xz
 COPY --from=minifier /usr.tar.xz /everest/usr.tar.xz
-COPY --from=builder /var/app/docker/scripts/entrypoint.sh /bin/entrypoint
-COPY --from=builder /var/app/docker/scripts/extract.sh /bin/extract
-COPY --from=builder /var/app/docker/scripts/run.sh /bin/kuzzle
 COPY --from=minifier /app.tar.xz /everest/app.tar.xz
 
 RUN  chmod a+x /bin/extract \

docker/images/kuzzle/Dockerfile

@@ -5,7 +5,6 @@ FROM node:12.16.3-stretch-slim as builder
 
 ADD ./bin /var/app/bin
 ADD ./config /var/app/config
-ADD ./docker /var/app/docker
 
 ADD ./lib /var/app/lib
 
@@ -68,7 +67,8 @@ FROM node:12.16.3-stretch-slim as minifier
 COPY --from=builder /usr/bin/strip /bin/strip
 COPY --from=builder /var/app /var/app
 
-RUN  apt-get update && apt-get install -y binutils  \
+RUN  set -x \
+  && apt-get update && apt-get install -y binutils  \
   && rm -rf /var/lib/apt/lists/* \
   && /bin/strip /usr/local/bin/node \
   && apt-get remove -y binutils \
@@ -87,11 +87,12 @@ LABEL description="Run your Kuzzle backend in production mode"
 ENV NODE_ENV=production
 
 ADD ./docker/scripts/promises.sh /promises.sh
+ADD ./docker/scripts/entrypoint.sh /bin/entrypoint
+ADD ./docker/scripts/extract.sh /bin/extract
+ADD ./docker/scripts/run.sh /bin/kuzzle
+
 COPY --from=minifier /lib.tar.xz /everest/lib.tar.xz
 COPY --from=minifier /usr.tar.xz /everest/usr.tar.xz
-COPY --from=builder /var/app/docker/scripts/entrypoint.sh /bin/entrypoint
-COPY --from=builder /var/app/docker/scripts/extract.sh /bin/extract
-COPY --from=builder /var/app/docker/scripts/run.sh /bin/kuzzle
 COPY --from=minifier /app.tar.xz /everest/app.tar.xz
 
 RUN  chmod a+x /bin/extract \

docker/images/plugin-dev/Dockerfile

@@ -73,18 +73,19 @@ FROM debian:stretch-slim as plugin-dev
 LABEL io.kuzzle.vendor="Kuzzle <[email protected]>"
 LABEL description="Develop new plugin or protocol for Kuzzle with ease"
 
-COPY --from=builder /usr/bin/xz /bin/xz
 ADD ./docker/scripts/promises.sh /promises.sh
+ADD ./docker/scripts/entrypoint.sh /bin/entrypoint
+ADD ./docker/scripts/extract.sh /bin/extract
+ADD ./docker/scripts/run-plugin.sh /bin/run-plugin
+
+COPY --from=builder /usr/bin/xz /bin/xz
 COPY --from=builder /lib.tar.xz /everest/lib.tar.xz
 COPY --from=builder /usr.tar.xz /everest/usr.tar.xz
-COPY --from=builder /var/app/docker/scripts/entrypoint.sh /bin/entrypoint
-COPY --from=builder /var/app/docker/scripts/extract.sh /bin/extract
-COPY --from=builder /var/app/docker/scripts/run-plugin.sh /bin/run-plugin
 COPY --from=builder /app.tar.xz /everest/app.tar.xz
 
-RUN  apt-get update \
+RUN  set -x \
+  && apt-get update \
   && apt-get install xz-utils \
-  && rm -rf /var/lib/apt/lists/* \
   && rm /bin/sh \
   && ln -s /bin/bash /bin/sh \
   && chmod a+x /bin/extract \

docker/scripts/extract.sh

@@ -2,41 +2,38 @@
 
 source /promises.sh
 
-if [ -f /everest/lib.tar.xz ] && [ -f /everest/usr.tar.xz ] && [ -f /everest/app.tar.xz ]; then
-    init_promises "strict"
+init_promises "strict"
 
-    echo "[ℹ] Decompressing system.."
-    cd /everest
+cd /everest
 
-    promise_run tar xf lib.tar.xz
-      promise_then cp -r lib/* ../lib/.
+files=$(ls -I app.tar.xz *.tar.xz)
 
-    promise_run tar xf usr.tar.xz
-      promise_then  cp -r usr/* ../usr/.
+echo "[ℹ] Decompressing system.."
+for file in $files;
+do
+  basename="${file%.tar.xz}"
 
-    echo "[ℹ] Decompressing Kuzzle.."
-    cd /everest
-    promise_run tar xf app.tar.xz
+  promise_run tar xf $file
+    promise_then cp -r $basename/* /$basename/.
+done
 
-    await_promises
+echo "[ℹ] Decompressing Kuzzle.."
 
-    echo "[ℹ] Copying Kuzzle.."
-    mkdir -p /var/app
-    for file in bin config default.config.js docker lib node_modules package-lock.json package.json; do
-      promise_run cp -r var/app/$file ../var/app/$file
-    done
+promise_run tar xf app.tar.xz
 
-    mkdir -p /var/app/plugins/enabled
-    mkdir -p /var/app/plugins/available
-    promise_run cp -r var/app/plugins/available/* ../var/app/plugins/available/.
-    promise_run cp -r var/app/plugins/enabled/* ../var/app/plugins/enabled/.
+await_promises
 
-    await_promises
+echo "[ℹ] Copying Kuzzle.."
+mkdir -p /var/app
+for file in bin config default.config.js docker lib node_modules package-lock.json package.json; do
+  promise_run cp -r var/app/$file ../var/app/$file
+done
 
-    echo "[✔] System ready"
-else
+mkdir -p /var/app/plugins/enabled
+mkdir -p /var/app/plugins/available
+promise_run cp -r var/app/plugins/available/* ../var/app/plugins/available/.
+promise_run cp -r var/app/plugins/enabled/* ../var/app/plugins/enabled/.
 
-  echo "[x] Missing /system/system.tar.xz and /everest/app.tar.xz"
-  exit 1
+await_promises
 
-fi
+echo "[✔] System ready"

docker/scripts/run-dev.sh

@@ -10,11 +10,11 @@ if [ ! -z "$TRAVIS" ] || [ ! -z "$REBUILD" ]; then
     npm ci --unsafe-perm
     chmod -R 777 node_modules/
     npm rebuild all --unsafe-perm
-    docker-compose/scripts/install-plugins.sh
+    ./docker/scripts/install-plugins.sh
 elif [ ! -d "./node_modules/" ]; then
     git submodule update --init --recursive
     npm ci --unsafe-perm
-    ./docker-compose/scripts/install-plugins.sh
+    ./docker/scripts/install-plugins.sh
 fi
 
 echo "[$(date)] - Starting Kuzzle..."