From 11d27ce37004e6ebade9864bc8bb0944fb70c868 Mon Sep 17 00:00:00 2001
From: Alex Layton <alex@layton.in>
Date: Mon, 12 Feb 2024 18:22:01 -0500
Subject: [PATCH] Update

---
 Dockerfile                  | 10 +++++-----
 docker-compose.override.yml |  5 +++--
 entrypoint.sh               | 14 ++++++--------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e6bb3b6..6df9316 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG COMPOSE_VER=alpine-1.29.2
-ARG OADA_VER=3.6.1
+ARG DOCKER_VER=cli
+ARG OADA_VER=3.10.0
 
 # Fetch the oada compose file
-FROM docker/compose:$COMPOSE_VER as oada-compose
+FROM docker:$DOCKER_VER AS oada-compose
 ARG OADA_VER
 
 RUN if test "${OADA_VER}" = 'latest'; then \
@@ -25,7 +25,7 @@ RUN if test "${OADA_VER}" = 'latest'; then \
     wget https://github.com/OADA/server/releases/download/v${OADA_VER}/docker-compose.yml; \
     fi
 
-FROM docker/compose:$COMPOSE_VER
+FROM docker:$DOCKER_VER
 
 WORKDIR /qlever-oada
 
@@ -42,7 +42,7 @@ RUN apk add --no-cache \
 COPY ./entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "/entrypoint.sh"]
-CMD ["up"]
+CMD ["up", "--no-log-prefix"]
 
 # Wait for /bookmarks to be up
 HEALTHCHECK --start-period=4m --interval=5s --retries=50 CMD \
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 4b9b4d4..0395cc5 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -15,7 +15,8 @@
 
 # Create network for piping between the proxy and the "oada" container
 networks:
-  pipe:
+  qlever_oada_pipe:
+    external: true
 
 services:
   startup:
@@ -30,7 +31,7 @@ services:
     expose:
       - "80"
     networks:
-      pipe:
+      qlever_oada_pipe:
         aliases:
           - oada-dood
       http_net:
diff --git a/entrypoint.sh b/entrypoint.sh
index 27da6c3..ba84688 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,13 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if test "$1" = 'up'; then
-    # Connect this container to the oada pipe
-    docker network create qlever-oada_pipe
-    docker network connect qlever-oada_pipe "$(hostname)"
-    
-    # Forward this containers port 80 to OADA port 80
-    socat TCP-LISTEN:80,fork TCP:oada-dood:80 &
-fi
+# Connect this container to the oada pipe
+docker network create qlever_oada_pipe
+docker network connect qlever_oada_pipe "$(hostname)"
+
+# Forward this containers port 80 to OADA port 80
+socat TCP-LISTEN:80,fork TCP:oada-dood:80 &
 
 docker-compose "$@"