update docker compose and network setup

services/dockerhub/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   #  See https://github.com/maccyber/micro-dockerhub-hook
@@ -26,14 +24,13 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - ./scripts:/src/scripts
-      # Paths to docker-compose files who are triggered by scripts:
+      # Paths to docker compose files who are triggered by scripts:
       - ./../pygeoapi_master:/srv/pygeoapi_master
       - ./../home:/srv/home
       - ./../pygeoapi_cite:/srv/pygeoapi_cite
       - ./../pygeoapi_covid-19:/srv/pygeoapi_covid-19
 
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
+  pygeoapi-network:
+    external: true

services/dockerhub/scripts/home.update.sh

@@ -2,7 +2,7 @@
 
 echo "Updating pygeoapi home..."
 
-cd /srv/home && ./stop.sh && docker pull geopython/demo.pygeoapi.io:latest && docker-compose up -d
+cd /srv/home && ./stop.sh && docker pull geopython/demo.pygeoapi.io:latest && docker compose up -d
 
 echo "Cleaning up..."
 

services/dockerhub/scripts/pygeoapi_latest.update.sh

@@ -4,15 +4,15 @@ echo "Updating pygeoapi_master..."
 
 docker pull geopython/pygeoapi:latest
 
-cd /srv/pygeoapi_master && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_master && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Updating pygeoapi_cite..."
 
-cd /srv/pygeoapi_cite && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_cite && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Updating pygeoapi_covid-19..."
 
-cd /srv/pygeoapi_covid-19 && ./stop.sh && ./build.sh && docker-compose up -d
+cd /srv/pygeoapi_covid-19 && ./stop.sh && ./build.sh && docker compose up -d
 
 echo "Cleaning up..."
 

services/dockerhub/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/dockerhub/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force

services/home/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.6.7-alpine3.8
+FROM python:3.11-alpine3.21
 
 LABEL maintainer="Just van den Broecke <[email protected]>"
 

services/pygeoapi_cite/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose build
+docker compose build

services/pygeoapi_cite/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   pygeoapi_cite:
@@ -29,6 +27,5 @@ services:
       - "traefik.docker.network=pygeoapi-network"
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
+  pygeoapi-network:
+    external: true

services/pygeoapi_cite/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/pygeoapi_cite/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force

services/pygeoapi_covid-19/build.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker-compose build
+docker compose build

services/pygeoapi_covid-19/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   pygeoapi_cite:
@@ -28,6 +26,5 @@ services:
       - "traefik.docker.network=pygeoapi-network"
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
+  pygeoapi-network:
+    external: true

services/pygeoapi_covid-19/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/pygeoapi_covid-19/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force

services/pygeoapi_master/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   pygeoapi_master:
@@ -27,6 +25,5 @@ services:
       - "traefik.docker.network=pygeoapi-network"
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
+  pygeoapi-network:
+    external: true

services/pygeoapi_master/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/pygeoapi_master/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force

services/pygeoapi_stable/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
 
   pygeoapi_stable:
@@ -31,6 +29,5 @@ services:
       - "traefik.docker.network=pygeoapi-network"
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
+  pygeoapi-network:
+    external: true

services/pygeoapi_stable/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 ./stop.sh
-docker-compose up -d
+docker compose up -d

services/pygeoapi_stable/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force

services/traefik/docker-compose.yml

@@ -1,8 +1,6 @@
-version: '3.1'
-
 services:
   proxy:
-    image: traefik:1.7.10-alpine
+    image: traefik:v3.3.2
 
     container_name: traefik
 
@@ -28,7 +26,5 @@ volumes:
   traefik_logs:
 
 networks:
-  default:
-    external:
-      name: pygeoapi-network
-
+  pygeoapi-network:
+    external: true

services/traefik/start.sh

@@ -16,4 +16,4 @@ export ACME_FILE="config/acme.json"
   && touch ${ACME_FILE}
 
 chmod 600 ${ACME_FILE}
-docker-compose up -d
+docker compose up -d

services/traefik/stop.sh

@@ -5,6 +5,6 @@ export HTTP_PORT=80
 [[ ${HOSTNAME} != PYGEOAPI ]] && HTTP_PORT=8000
 export ACME_FILE="config/acme.json"
 
-docker-compose stop
-docker-compose rm --force
+docker compose stop
+docker compose rm --force
 chmod 600 ${ACME_FILE}