Docker tweaks for new base

x-atlas-consortia · Sep 4, 2024 · df27fed · df27fed
1 parent 00704da
commit df27fed
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 18 deletions.
diff --git a/docker/docker-compose.deployment.yml b/docker/docker-compose.deployment.yml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   hs-ontology-api: 

diff --git a/docker/docker-compose.development.yml b/docker/docker-compose.development.yml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   hs-ontology-api:

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,6 +1,3 @@
-version: "3.7"
-
-# Will use the hostname when talking between services on the same network
 services:
 
   hs-ontology-api:

diff --git a/docker/docker-deployment.sh b/docker/docker-deployment.sh
@@ -56,11 +56,11 @@ else
     echo
 
     if [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api up -d
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api stop
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api down
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p hs-ontology-api down
     fi
 fi
 
diff --git a/docker/docker-development.sh b/docker/docker-development.sh
@@ -83,7 +83,7 @@ else
 
         echo 'Checks complete, all good :)'
     elif [ "$1" = "config" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api config
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api config
     elif [ "$1" = "build" ]; then
         # Delete the copied source code dir if exists
         if [ -d "ubkg-api/src" ]; then
@@ -106,13 +106,13 @@ else
         cp ../VERSION ubkg-api
         cp ../BUILD ubkg-api
 
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api build
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api build
     elif [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api up -d
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api stop
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api down
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p hs-ontology-api down
     fi
 fi
 
diff --git a/docker/ubkg-api/Dockerfile b/docker/ubkg-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 and SenNet Ontology API"
 

diff --git a/docker/ubkg-api/entrypoint.sh b/docker/ubkg-api/entrypoint.sh
@@ -20,7 +20,8 @@ touch /var/run/nginx.pid
 chown -R hubmap:hubmap /var/run/nginx.pid
 chown -R hubmap:hubmap /var/cache/nginx
 chown -R hubmap:hubmap /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 hubmap "$@"
+exec /usr/local/bin/su-exec hubmap "$@"