Merge pull request #869 from hubmapconsortium/yuanzhou/new-docker-base

Upgrade docker base image

VERSION

@@ -1 +1 @@
-3.4.8
+3.4.9

docker/docker-compose.deployment.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   search-api: 

docker/docker-compose.development.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   search-api:

docker/docker-compose.yml

@@ -1,6 +1,3 @@
-version: "3.7"
-
-# Will use the hostname when talking between services on the same network
 services:
 
   search-api:

docker/docker-deployment.sh

@@ -64,11 +64,11 @@ else
     echo
 
     if [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api up -d
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api stop
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api down
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p search-api down
     fi
 fi
 

docker/docker-development.sh

@@ -91,7 +91,7 @@ else
 
         echo 'Checks complete, all good :)'
     elif [ "$1" = "config" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p search-api config
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p search-api config
     elif [ "$1" = "build" ]; then
         # Delete the copied source code dir if exists
         if [ -d "search-api/src" ]; then
@@ -114,13 +114,13 @@ else
         cp ../VERSION search-api
         cp ../BUILD search-api
 
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p search-api build
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p search-api build
     elif [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p search-api up -d
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p search-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p search-api stop
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p search-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p search-api down
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p search-api down
     fi
 fi
 

docker/search-api/Dockerfile

@@ -1,5 +1,5 @@
 # Parent image
-FROM hubmap/api-base-image:1.0.0
+FROM hubmap/api-base-image:1.1.0
 
 LABEL description="HuBMAP Search API Service"
 

docker/search-api/entrypoint.sh

@@ -26,7 +26,7 @@ chown -R hive:hive /var/run/nginx.pid
 chown -R hive:hive /var/cache/nginx
 chown -R hive:hive /var/log/nginx
 
-# Lastly we use gosu to execute our process "$@" as that user
+# Lastly we use su-exec to execute our process "$@" as that user
 # Remember CMD from a Dockerfile of child image gets passed to the entrypoint.sh as command line arguments
 # "$@" is a shell variable that means "all the arguments"
-exec /usr/local/bin/gosu hive "$@"
+exec /usr/local/bin/su-exec hive "$@"