From a4651d3b6b295ac7a77f7bc85737de9c4d2f69f5 Mon Sep 17 00:00:00 2001
From: kburke <kburke@pitt.edu>
Date: Thu, 29 Aug 2024 15:39:01 -0400
Subject: [PATCH 1/2] Use api-base-image version 1.1.0. Switch from gosu to
 su-exec for launching entry point. Discard unneed Python PCRE packages.

---
 docker/docker-deployment.sh     | 6 +++---
 docker/docker-development.sh    | 8 ++++----
 docker/entity-api/Dockerfile    | 2 +-
 docker/entity-api/entrypoint.sh | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/docker-deployment.sh b/docker/docker-deployment.sh
index ecd1b35a..fa654312 100755
--- 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
index b7452170..05febd50 100755
--- 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
index 4c39adda..9d861c54 100644
--- 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
index 201de8ef..93808a8e 100644
--- 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 "$@"

From 47249f14922b3607100266c7a729d7b32b662f07 Mon Sep 17 00:00:00 2001
From: yuanzhou <zhy19@pitt.edu>
Date: Wed, 4 Sep 2024 10:41:57 -0400
Subject: [PATCH 2/2] Remove obselete version line

---
 docker/docker-compose.deployment.yml  | 2 --
 docker/docker-compose.development.yml | 2 --
 docker/docker-compose.yml             | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/docker/docker-compose.deployment.yml b/docker/docker-compose.deployment.yml
index 9ce91910..92b59aef 100644
--- 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
index 80ff1cc0..3d2fa610 100644
--- 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
index 7c05e6b1..8b36e89d 100644
--- 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: