From abc37d1d29637860d23ae2a87bfc52e9f674f123 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Fri, 2 Sep 2016 13:44:05 +0200 Subject: [PATCH 1/4] Entrypoint with new environmental var XD_EXTERNAL_IP --- docker/docker-entrypoint.sh | 62 +++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 9cc2cb2ca..9adac4a27 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -32,37 +32,61 @@ if [ "${XD_MODE}" == "Streaming" ]; then sed -i "s|crossdata-core.streaming.receiver.kafka.connection = \"localhost:9092\"|crossdata-core.streaming.receiver.kafka.connection = \"${XD_KAFKA_CONNECTION_STRING}\"|" /etc/sds/crossdata/server/core-application.conf sed -i "s|crossdata-core.streaming.spark.master = \"spark://localhost:7077\"|crossdata-core.streaming.spark.master = \"${SPARK_MASTER}\" |" /etc/sds/crossdata/server/core-application.conf fi + HOST="hostname -f" if [[ "$(hostname -f)" =~ \. ]]; then - HOST="$(hostname -f)" + HOST="$(hostname -f)" else - HOST="$(hostname -i)" + HOST="$(hostname -i)" fi -AKKAIP=akka.tcp:\/\/CrossdataServerCluster@${HOST}:13420 -#TODO: Test instead of XD_SEED : CROSSDATA_SERVER_AKKA_CLUSTER_SEED_NODES -if [ -z ${XD_SEED}]; then - sed -i "s|127.0.0.1|${HOST}|" /etc/sds/crossdata/server/hazelcast.xml - sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf + +#Marathon support +if [ -z ${MARATHON_APP_ID} ]; then + AKKAIP=akka.tcp:\/\/CrossdataServerCluster@${HOST}:13420 + #TODO: Test instead of XD_SEED : CROSSDATA_SERVER_AKKA_CLUSTER_SEED_NODES + if [ -z ${XD_SEED} ]; then + sed -i "s|127.0.0.1|${HOST}|" /etc/sds/crossdata/server/hazelcast.xml + sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf + else + SEED_IP=akka.tcp:\/\/CrossdataServerCluster@${XD_SEED}:13420 + sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${SEED_IP}\",\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml + fi + #TODO: Check environment vars for hostname and bind hostname & ports + sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + if [ -z ${XD_SEED} ]; then + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\"]|" /etc/sds/crossdata/shell/driver-application.conf + else + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\", \"${XD_SEED}\"]|" /etc/sds/crossdata/shell/driver-application.conf + fi else - SEED_IP=akka.tcp:\/\/CrossdataServerCluster@${XD_SEED}:13420 - sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${SEED_IP}\",\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf - sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml -fi + #XD_EXTERNAL_IP Must be specified + if [ -z ${XD_EXTERNAL_IP} ] || [ -z ${MARATHON_APP_LABEL_HAPROXY_0_PORT} ]; then + echo ERROR: Env var XD_EXTERNAL_IP and label HAPROXY_0_PORT must be provided using Marathon&Haproxy 1>&2 + exit 1 # terminate and indicate error + else + #Hostname and port of haproxy + HAPROXY_FINAL_ROUTE=${XD_EXTERNAL_IP}:${MARATHON_APP_LABEL_HAPROXY_0_PORT} + sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${XD_EXTERNAL_IP}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.port.*|crossdata-server.akka.remote.netty.tcp.port = \"${MARATHON_APP_LABEL_HAPROXY_0_PORT}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"akka.tcp:\/\/CrossdataServerCluster@${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/server/server-application.conf -#TODO: Check environment vars for hostname and bind hostname & ports -sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf -sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + #Bind address for local + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-port.*|crossdata-server.akka.remote.netty.tcp.bind-port = \"13420\"|" /etc/sds/crossdata/server/server-application.conf + #Hazelcast TODO check + sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml + fi +fi + +#TODO spark external check sed -i "s|local\[.\]|${SPARK_MASTER:=local\[2\]}|" /etc/sds/crossdata/server/server-application.conf sed -i "s|crossdata-server.config.spark.driver.memory.*|crossdata-server.config.spark.driver.memory = ${XD_DRIVER_MEMORY:=512M}|" /etc/sds/crossdata/server/server-application.conf sed -i "s|crossdata-server.config.spark.executor.memory.*|crossdata-server.config.spark.executor.memory = ${XD_EXECUTOR_MEMORY:=512M}|" /etc/sds/crossdata/server/server-application.conf sed -i "s|crossdata-server.config.spark.cores.max.*|crossdata-server.config.spark.cores.max = ${XD_CORES:=4}|" /etc/sds/crossdata/server/server-application.conf /etc/init.d/crossdata start -if [ -z ${XD_SEED}]; then - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\"]|" /etc/sds/crossdata/shell/driver-application.conf -else - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\", \"${XD_SEED}\"]|" /etc/sds/crossdata/shell/driver-application.conf -fi tail -F /var/log/sds/crossdata/crossdata.log \ No newline at end of file From 9321107ca8a22c8c1d2bb37d4bffdeca9e179b20 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Mon, 5 Sep 2016 11:36:23 +0200 Subject: [PATCH 2/4] Entry point with RAM --- docker/docker-entrypoint.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 9adac4a27..986f0ed37 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -52,6 +52,7 @@ if [ -z ${MARATHON_APP_ID} ]; then sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${SEED_IP}\",\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml fi + #TODO: Check environment vars for hostname and bind hostname & ports sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf @@ -66,6 +67,11 @@ else echo ERROR: Env var XD_EXTERNAL_IP and label HAPROXY_0_PORT must be provided using Marathon&Haproxy 1>&2 exit 1 # terminate and indicate error else + #Memory + RAM_AVAIL=$(echo $MARATHON_APP_RESOURCE_MEM | cut -d "." -f1) + CROSSDATA_JAVA_OPT="-Xmx${RAM_AVAIL}m -Xms${RAM_AVAIL}m" + sed -i "s|# CROSSDATA_LIB|#CROSSDATA_JAVA_OPTS\nCROSSDATA_JAVA_OPTS=\"${CROSSDATA_JAVA_OPT}\"\n# CROSSDATA_LIB|" /etc/sds/crossdata/server/crossdata-env.sh + #Hostname and port of haproxy HAPROXY_FINAL_ROUTE=${XD_EXTERNAL_IP}:${MARATHON_APP_LABEL_HAPROXY_0_PORT} sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${XD_EXTERNAL_IP}\"|" /etc/sds/crossdata/server/server-application.conf @@ -77,7 +83,10 @@ else sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-port.*|crossdata-server.akka.remote.netty.tcp.bind-port = \"13420\"|" /etc/sds/crossdata/server/server-application.conf #Hazelcast TODO check - sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml + #sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml + + #Driver + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/shell/driver-application.conf fi fi From 42f9dbc927e09cf345c412b41f4897c1c4dc0779 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Tue, 6 Sep 2016 12:06:25 +0200 Subject: [PATCH 3/4] Supporting akka-http scenario --- docker/docker-entrypoint.sh | 83 ++++++++++++++++++++++--------------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 6c93f900d..23d7afe4f 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -33,20 +33,19 @@ if [ "${XD_MODE}" == "Streaming" ]; then sed -i "s|crossdata-core.streaming.spark.master = \"spark://localhost:7077\"|crossdata-core.streaming.spark.master = \"${SPARK_MASTER}\" |" /etc/sds/crossdata/server/core-application.conf fi -HOST="hostname -f" +DOCKER_HOST="hostname -f" if [[ "$(hostname -f)" =~ \. ]]; then - HOST="$(hostname -f)" + DOCKER_HOST="$(hostname -f)" else - HOST="$(hostname -i)" + DOCKER_HOST="$(hostname -i)" fi -#Marathon support +#Scenary: Working out from Marathon if [ -z ${MARATHON_APP_ID} ]; then - AKKAIP=akka.tcp:\/\/CrossdataServerCluster@${HOST}:13420 - + AKKAIP=akka.tcp:\/\/CrossdataServerCluster@${DOCKER_HOST}:13420 #TODO: Test instead of XD_SEED : CROSSDATA_SERVER_AKKA_CLUSTER_SEED_NODES if [ -z ${XD_SEED} ]; then - sed -i "s|127.0.0.1|${HOST}|" /etc/sds/crossdata/server/hazelcast.xml + sed -i "s|127.0.0.1|${DOCKER_HOST}|" /etc/sds/crossdata/server/hazelcast.xml sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"${AKKAIP}\"]|" /etc/sds/crossdata/server/server-application.conf else SEED_IP=akka.tcp:\/\/CrossdataServerCluster@${XD_SEED}:13420 @@ -55,39 +54,60 @@ if [ -z ${MARATHON_APP_ID} ]; then fi #TODO: Check environment vars for hostname and bind hostname & ports - sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf - sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${DOCKER_HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${DOCKER_HOST}\"|" /etc/sds/crossdata/server/server-application.conf if [ -z ${XD_SEED} ]; then - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\"]|" /etc/sds/crossdata/shell/driver-application.conf + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${DOCKER_HOST}:13420\"]|" /etc/sds/crossdata/shell/driver-application.conf else - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\", \"${XD_SEED}\"]|" /etc/sds/crossdata/shell/driver-application.conf + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${DOCKER_HOST}:13420\", \"${XD_SEED}\"]|" /etc/sds/crossdata/shell/driver-application.conf fi else - #XD_EXTERNAL_IP Must be specified - if [ -z ${XD_EXTERNAL_IP} ] || [ -z ${MARATHON_APP_LABEL_HAPROXY_0_PORT} ]; then - echo ERROR: Env var XD_EXTERNAL_IP and label HAPROXY_0_PORT must be provided using Marathon&Haproxy 1>&2 - exit 1 # terminate and indicate error - else - #Memory - RAM_AVAIL=$(echo $MARATHON_APP_RESOURCE_MEM | cut -d "." -f1) - CROSSDATA_JAVA_OPT="-Xmx${RAM_AVAIL}m -Xms${RAM_AVAIL}m" - sed -i "s|# CROSSDATA_LIB|#CROSSDATA_JAVA_OPTS\nCROSSDATA_JAVA_OPTS=\"${CROSSDATA_JAVA_OPT}\"\n# CROSSDATA_LIB|" /etc/sds/crossdata/server/crossdata-env.sh + #Scenary: Working in Marathon + + #Memory + RAM_AVAIL=$(echo $MARATHON_APP_RESOURCE_MEM | cut -d "." -f1) + CROSSDATA_JAVA_OPT="-Xmx${RAM_AVAIL}m -Xms${RAM_AVAIL}m" + sed -i "s|# CROSSDATA_LIB|#CROSSDATA_JAVA_OPTS\nCROSSDATA_JAVA_OPTS=\"${CROSSDATA_JAVA_OPT}\"\n# CROSSDATA_LIB|" /etc/sds/crossdata/server/crossdata-env.sh - #Hostname and port of haproxy - HAPROXY_FINAL_ROUTE=${XD_EXTERNAL_IP}:${MARATHON_APP_LABEL_HAPROXY_0_PORT} - sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${XD_EXTERNAL_IP}\"|" /etc/sds/crossdata/server/server-application.conf - sed -i "s|#crossdata-server.akka.remote.netty.tcp.port.*|crossdata-server.akka.remote.netty.tcp.port = \"${MARATHON_APP_LABEL_HAPROXY_0_PORT}\"|" /etc/sds/crossdata/server/server-application.conf - sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"akka.tcp:\/\/CrossdataServerCluster@${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/server/server-application.conf + #If XD_EXTERNAL_IP and MARATHON_APP_LABEL_HAPROXY_0_PORT are not specified assume we are working in HTTP mode + #Scenary: HAProxy exposing Akka http port, and creating an internal cluster using netty and autodiscovery through Zookeeper + if [ -z ${XD_EXTERNAL_IP} ] && [ -z ${MARATHON_APP_LABEL_HAPROXY_0_PORT} ]; then + + #Hostname and port from host machine ($HOST:$PORT_13420) + HOST_ROUTE=${HOST}:${PORT_13420} + sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.port.*|crossdata-server.akka.remote.netty.tcp.port = \"${PORT_13420}\"|" /etc/sds/crossdata/server/server-application.conf #Bind address for local - sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${DOCKER_HOST}\"|" /etc/sds/crossdata/server/server-application.conf sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-port.*|crossdata-server.akka.remote.netty.tcp.bind-port = \"13420\"|" /etc/sds/crossdata/server/server-application.conf - #Hazelcast TODO check - #sed -i "s|127.0.0.1|${XD_SEED}|" /etc/sds/crossdata/server/hazelcast.xml + #Hazelcast + sed -i "s|127.0.0.1|${HOST_ROUTE}|" /etc/sds/crossdata/server/hazelcast.xml #Driver - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/shell/driver-application.conf + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST_ROUTE}\"]|" /etc/sds/crossdata/shell/driver-application.conf + + else + + #Scenary: HAProxy exposing the akka netty port with the external IP. Supported only for one instance of Crossdata + if [ -z ${XD_EXTERNAL_IP} ] || [ -z ${MARATHON_APP_LABEL_HAPROXY_0_PORT} ]; then + echo "ERROR: Env var XD_EXTERNAL_IP and label HAPROXY_0_PORT must be provided together using Marathon&Haproxy in TCP mode" 1>&2 + exit 1 # terminate and indicate error + else + #Hostname and port of haproxy + HAPROXY_FINAL_ROUTE=${XD_EXTERNAL_IP}:${MARATHON_APP_LABEL_HAPROXY_0_PORT} + sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${XD_EXTERNAL_IP}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.port.*|crossdata-server.akka.remote.netty.tcp.port = \"${MARATHON_APP_LABEL_HAPROXY_0_PORT}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"akka.tcp:\/\/CrossdataServerCluster@${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/server/server-application.conf + + #Bind address for local + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${DOCKER_HOST}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-port.*|crossdata-server.akka.remote.netty.tcp.bind-port = \"13420\"|" /etc/sds/crossdata/server/server-application.conf + + #Driver + sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HAPROXY_FINAL_ROUTE}\"]|" /etc/sds/crossdata/shell/driver-application.conf + fi fi fi @@ -98,10 +118,5 @@ sed -i "s|crossdata-server.config.spark.executor.memory.*|crossdata-server.confi sed -i "s|crossdata-server.config.spark.cores.max.*|crossdata-server.config.spark.cores.max = ${XD_CORES:=4}|" /etc/sds/crossdata/server/server-application.conf /etc/init.d/crossdata start -if [ -z ${XD_SEED}]; then - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\"]|" /etc/sds/crossdata/shell/driver-application.conf -else - sed -i "s|crossdata-driver.config.cluster.hosts.*|crossdata-driver.config.cluster.hosts = [\"${HOST}:13420\", \"${XD_SEED}\"]|" /etc/sds/crossdata/shell/driver-application.conf -fi tail -F /var/log/sds/crossdata/crossdata.log \ No newline at end of file From e06f245d6a6997bf8174fb06eacbb58048d8acc7 Mon Sep 17 00:00:00 2001 From: Unai Sarasola Date: Fri, 9 Sep 2016 14:04:38 +0200 Subject: [PATCH 4/4] Working without HAProxy --- docker/docker-entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 23d7afe4f..bdab98512 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -77,6 +77,7 @@ else HOST_ROUTE=${HOST}:${PORT_13420} sed -i "s|#crossdata-server.akka.remote.netty.tcp.hostname.*|crossdata-server.akka.remote.netty.tcp.hostname = \"${HOST}\"|" /etc/sds/crossdata/server/server-application.conf sed -i "s|#crossdata-server.akka.remote.netty.tcp.port.*|crossdata-server.akka.remote.netty.tcp.port = \"${PORT_13420}\"|" /etc/sds/crossdata/server/server-application.conf + sed -i "s|#crossdata-server.akka.cluster.seed-nodes =.*|crossdata-server.akka.cluster.seed-nodes = [\"akka.tcp:\/\/CrossdataServerCluster@${HOST_ROUTE}\"]|" /etc/sds/crossdata/server/server-application.conf #Bind address for local sed -i "s|#crossdata-server.akka.remote.netty.tcp.bind-hostname.*|crossdata-server.akka.remote.netty.tcp.bind-hostname = \"${DOCKER_HOST}\"|" /etc/sds/crossdata/server/server-application.conf