Make dockerfile and server helper script more robust.

mozilla · Jan 30, 2017 · a2b17b9 · a2b17b9
1 parent 547e503
commit a2b17b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/conf/run.sh b/conf/run.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 cd $(dirname $0)
 case "$1" in

diff --git a/server b/server
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 HERE="$(pwd)"
 
@@ -60,7 +61,7 @@ case "$1" in
         if [ ! -z "$SCHEDULER_ID" ]; then
           $0 stop scheduler
         fi
-        docker build --pull -t mozilla/ichnaea .
+        docker build -t mozilla/ichnaea .
         docker run -d \
           -e "REDIS_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_redis`" \
           -e "DB_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_mysql`" \
@@ -73,7 +74,7 @@ case "$1" in
         if [ ! -z "$WEB_ID" ]; then
           $0 stop web
         fi
-        docker build --pull -t mozilla/ichnaea .
+        docker build -t mozilla/ichnaea .
         docker run -d \
           -e "REDIS_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_redis`" \
           -e "DB_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_mysql`" \
@@ -86,7 +87,7 @@ case "$1" in
         if [ ! -z "$WORKER_ID" ]; then
           $0 stop worker
         fi
-        docker build --pull -t mozilla/ichnaea .
+        docker build -t mozilla/ichnaea .
         docker run -d \
           -e "REDIS_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_redis`" \
           -e "DB_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_mysql`" \
@@ -95,11 +96,11 @@ case "$1" in
 
       # Builds and starts the services supporting the application container.
       services)
-        cd docker/mysql; docker build --pull -t mozilla/ichnaea_mysql:latest .
+        cd docker/mysql; docker build -t mozilla/ichnaea_mysql:latest .
         cd $HERE
-        cd docker/redis; docker build --pull -t mozilla/ichnaea_redis:latest .
+        cd docker/redis; docker build -t mozilla/ichnaea_redis:latest .
         cd $HERE
-        docker-compose build --pull
+        docker-compose build
         docker-compose up -d
         ;;
 
@@ -165,7 +166,7 @@ case "$1" in
   # Runs command inside the container.
   run)
     $0 start services
-    docker build --pull -t mozilla/ichnaea .
+    docker build -t mozilla/ichnaea .
     docker run -it --rm \
         -e "REDIS_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_redis`" \
         -e "DB_HOST=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' ichnaea_mysql`" \
@@ -181,7 +182,7 @@ case "$1" in
 
   # Runs bower using a special node container.
   bower_list)
-    cd docker/node; docker build --pull -t mozilla/ichnaea_node .
+    cd docker/node; docker build -t mozilla/ichnaea_node .
     cd $HERE
     docker run -it --rm \
         --volume `pwd`:/app mozilla/ichnaea_node \
@@ -190,7 +191,7 @@ case "$1" in
 
   # Updates CSS resources using a special node container.
   css)
-    cd docker/node; docker build --pull -t mozilla/ichnaea_node .
+    cd docker/node; docker build -t mozilla/ichnaea_node .
     cd $HERE
     docker run -it --rm \
         --volume `pwd`:/app mozilla/ichnaea_node \
@@ -204,7 +205,7 @@ case "$1" in
 
   # Updates JS resources using a special node container.
   js)
-    cd docker/node; docker build --pull -t mozilla/ichnaea_node .
+    cd docker/node; docker build -t mozilla/ichnaea_node .
     cd $HERE
     docker run -it --rm \
         --volume `pwd`:/app mozilla/ichnaea_node \