Merge pull request #733 from hubmapconsortium/karlburke/bumpDockerToUBI9

Karlburke/bump docker to ubi9
hubmapconsortium · Sep 9, 2024 · caa113a · caa113a
2 parents cf9ca70 + 47249f1
commit caa113a
Show file tree

Hide file tree

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

diff --git a/docker/docker-compose.development.yml b/docker/docker-compose.development.yml
@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
 
   entity-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:
 
   entity-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 entity-api up -d
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p entity-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p entity-api stop
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p entity-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.deployment.yml -p entity-api down
+        docker compose -f docker-compose.yml -f docker-compose.deployment.yml -p entity-api down
     fi
 fi
 
diff --git a/docker/docker-development.sh b/docker/docker-development.sh
@@ -106,13 +106,13 @@ else
         cp ../VERSION entity-api
         cp ../BUILD entity-api
 
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api build
+	docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api build
     elif [ "$1" = "start" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api up -d
+	docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api up -d
     elif [ "$1" = "stop" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api stop
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api stop
     elif [ "$1" = "down" ]; then
-        docker-compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api down
+        docker compose -f docker-compose.yml -f docker-compose.development.yml -p entity-api down
     fi
 fi
 
diff --git a/docker/entity-api/Dockerfile b/docker/entity-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 Entity API Service"
 

diff --git a/docker/entity-api/entrypoint.sh b/docker/entity-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 "$@"