Fix Dockerfile: update to Erlang21 (#364)

AntidoteDB · Mar 18, 2019 · 7870a87 · 7870a87
1 parent baf0421
commit 7870a87
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Dockerfiles/Dockerfile b/Dockerfiles/Dockerfile
@@ -1,4 +1,4 @@
-FROM erlang:19
+FROM erlang:21
 
 ENV HANDOFF_PORT "8099"
 ENV PB_PORT "8087"
@@ -21,7 +21,7 @@ RUN set -xe \
   && git checkout $ANTIDOTE_BRANCH \
   && make rel \
   && cp -R _build/default/rel/antidote /opt/ \
-  && sed -e '$i,{kernel, [{inet_dist_listen_min, 9100}, {inet_dist_listen_max, 9100}]}' /usr/src/antidote/_build/default/rel/antidote/releases/0.0.1/sys.config > /opt/antidote/releases/0.0.1/sys.config \
+  && sed -e '$i,{kernel, [{inet_dist_listen_min, 9100}, {inet_dist_listen_max, 9100}]}' /usr/src/antidote/_build/default/rel/antidote/releases/0.0.2/sys.config > /opt/antidote/releases/0.0.2/sys.config \
   && rm -rf /usr/src/antidote /var/lib/apt/lists/*
 
 ADD ./start_and_attach.sh /opt/antidote/

diff --git a/Dockerfiles/entrypoint.sh b/Dockerfiles/entrypoint.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 set -e
 
-if [ ! -f /opt/antidote/releases/0.0.1/setup_ok ]; then
-  cd /opt/antidote/releases/0.0.1/
+if [[ ! -f /opt/antidote/releases/0.0.2/setup_ok ]]; then
+  cd /opt/antidote/releases/0.0.2/
   cp vm.args vm.args_backup
-  if [ "$SHORT_NAME" = "true" ]; then
+  if [[ "$SHORT_NAME" = "true" ]]; then
     sed "s/-name /-sname /" vm.args_backup > vm.args
   fi
   touch setup_ok

diff --git a/Dockerfiles/start_and_attach.sh b/Dockerfiles/start_and_attach.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 NPROC=$(nproc)
 
-if [ "$NPROC" -ge 2 ]; then
+if [[ ${NPROC} -ge 2 ]]; then
   trap "echo 'Shutting down' && /opt/antidote/bin/env stop" TERM
   /opt/antidote/bin/env start && sleep 10 && tail -f /opt/antidote/log/console.log & wait ${!}
 else