Merge pull request #67 from kuzzleio/3.2.7-proposal

Release 3.2.7

Author: benoitvidis

docker-compose/config/pm2-dev.json

@@ -6,6 +6,7 @@
     "args"         : ["start"],
     "watch"        : ["lib/**/*.js", "plugins/enabled/**/*.js"],
     "ignore_watch" : ["node_modules", "coverage"],
-    "node_args": "--inspect=7000"
+    "node_args"    : "--inspect=0.0.0.0:9229",
+    "kill_timeout" : 15000
   }]
 }

docker-compose/docker-compose.yml.tpl

@@ -93,8 +93,6 @@ services:
     build: ./redis-cluster-init
     depends_on:
       - redis
-    command: cluster_redis_1 cluster_redis_2 cluster_redis_3
-
 
   elasticsearch:
     image: kuzzleio/elasticsearch:5.4.1

docker-compose/redis-cluster-init/Dockerfile

@@ -1,9 +1,9 @@
-FROM ruby
-MAINTAINER Kuzzle <support@kuzzle.io>
+FROM redis:5.0-alpine
 
-RUN  gem install redis \
-  && curl -SLO http://download.redis.io/redis-stable/src/redis-trib.rb \
-  && chmod a+x redis-trib.rb
+LABEL io.kuzzle.vendor="Kuzzle <support@kuzzle.io>"
+
+RUN  set -x \
+  && apk add --no-cache bind-tools
 
 COPY docker-entrypoint.sh /
 

docker-compose/redis-cluster-init/docker-entrypoint.sh

@@ -1,12 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
 args=""
-for container in "$@"; do
-  container_ip=$(getent hosts $container | awk '{ print $1 }')
-
-  echo "$container $container_ip"
-  args="$args ${container_ip}:6379"
+for server in $(host redis | awk '{ print $4 }'); do
+  args="${args} ${server}:6379"
 done
 
 sleep 5
-echo "yes" | ruby /redis-trib.rb create --replicas 0 $args
+echo "yes" | redis-cli --cluster create $args --cluster-replicas 0

docker-compose/scripts/devtools.sh

@@ -1,15 +1,16 @@
-#!/bin/bash
+#!/bin/bash 
 
-for container in $(docker ps | grep cluster_kuzzle_ | sed -E 's#^([^ ]+).*#\1#'); do
+for container in $(docker ps | grep kuzzle_ | awk '{ print $1 }'); do
   name=$(docker inspect --format '{{.Name}}' "$container")
-
+  network=$(docker inspect --format '{{.HostConfig.NetworkMode}}' $container)
   ip=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$container")
 
-  url=$(docker exec -t ${container} bash -c 'zgrep devtools /root/.pm2/logs/*.log | tail -n 1')
-  url=$(echo $url | sed -E 's|[^ ]+\s+||')
-  url=$(echo $url | sed -E "s|\&ws=127\.0\.0\.1|\&ws=${ip}|")
+  id=$(docker run -ti \
+    --network $network \
+      endeveit/docker-jq ash -c \
+      "curl -s http://$ip:9229/json/list | jq -Mrce '.[0].id'")
+  url="chrome-devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=$ip:9229/$id"
 
-  echo "$name"
-  echo "$url"
+  echo "  $name"
+  echo "  $url"
 done
-

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cluster",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "Add cluster capabilities to Kuzzle",
   "main": "./lib/index.js",
   "scripts": {