From 21be67411bc9133ea611afa15f75682ed9ec7f29 Mon Sep 17 00:00:00 2001 From: Tom Kralidis Date: Sun, 19 Jan 2025 11:34:34 -0500 Subject: [PATCH] update docker compose and network setup --- services/dockerhub/docker-compose.yml | 9 +++------ services/dockerhub/scripts/home.update.sh | 2 +- services/dockerhub/scripts/pygeoapi_latest.update.sh | 6 +++--- services/dockerhub/start.sh | 2 +- services/dockerhub/stop.sh | 4 ++-- services/home/Dockerfile | 2 +- services/pygeoapi_cite/build.sh | 2 +- services/pygeoapi_cite/docker-compose.yml | 7 ++----- services/pygeoapi_cite/start.sh | 2 +- services/pygeoapi_cite/stop.sh | 4 ++-- services/pygeoapi_covid-19/build.sh | 2 +- services/pygeoapi_covid-19/docker-compose.yml | 7 ++----- services/pygeoapi_covid-19/start.sh | 2 +- services/pygeoapi_covid-19/stop.sh | 4 ++-- services/pygeoapi_master/docker-compose.yml | 7 ++----- services/pygeoapi_master/start.sh | 2 +- services/pygeoapi_master/stop.sh | 4 ++-- services/pygeoapi_stable/docker-compose.yml | 7 ++----- services/pygeoapi_stable/start.sh | 2 +- services/pygeoapi_stable/stop.sh | 4 ++-- services/traefik/docker-compose.yml | 10 +++------- services/traefik/start.sh | 2 +- services/traefik/stop.sh | 4 ++-- 23 files changed, 39 insertions(+), 58 deletions(-) diff --git a/services/dockerhub/docker-compose.yml b/services/dockerhub/docker-compose.yml index f86c9c2..91c7f03 100644 --- a/services/dockerhub/docker-compose.yml +++ b/services/dockerhub/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - services: # See https://github.com/maccyber/micro-dockerhub-hook @@ -26,7 +24,7 @@ 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 @@ -34,6 +32,5 @@ services: networks: - default: - external: - name: pygeoapi-network + pygeoapi-network: + external: true diff --git a/services/dockerhub/scripts/home.update.sh b/services/dockerhub/scripts/home.update.sh index 68068d4..8f1fac9 100755 --- a/services/dockerhub/scripts/home.update.sh +++ b/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..." diff --git a/services/dockerhub/scripts/pygeoapi_latest.update.sh b/services/dockerhub/scripts/pygeoapi_latest.update.sh index 2990cbc..dc31f30 100755 --- a/services/dockerhub/scripts/pygeoapi_latest.update.sh +++ b/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..." diff --git a/services/dockerhub/start.sh b/services/dockerhub/start.sh index 31d6327..ff757c2 100755 --- a/services/dockerhub/start.sh +++ b/services/dockerhub/start.sh @@ -1,4 +1,4 @@ #!/bin/bash ./stop.sh -docker-compose up -d +docker compose up -d diff --git a/services/dockerhub/stop.sh b/services/dockerhub/stop.sh index 7221e13..c92720f 100755 --- a/services/dockerhub/stop.sh +++ b/services/dockerhub/stop.sh @@ -1,4 +1,4 @@ #!/bin/bash -docker-compose stop -docker-compose rm --force +docker compose stop +docker compose rm --force diff --git a/services/home/Dockerfile b/services/home/Dockerfile index 4218bd0..69e83af 100644 --- a/services/home/Dockerfile +++ b/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 " diff --git a/services/pygeoapi_cite/build.sh b/services/pygeoapi_cite/build.sh index 250e4a7..483285d 100755 --- a/services/pygeoapi_cite/build.sh +++ b/services/pygeoapi_cite/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker-compose build +docker compose build diff --git a/services/pygeoapi_cite/docker-compose.yml b/services/pygeoapi_cite/docker-compose.yml index cf10854..25f1440 100644 --- a/services/pygeoapi_cite/docker-compose.yml +++ b/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 diff --git a/services/pygeoapi_cite/start.sh b/services/pygeoapi_cite/start.sh index 31d6327..ff757c2 100755 --- a/services/pygeoapi_cite/start.sh +++ b/services/pygeoapi_cite/start.sh @@ -1,4 +1,4 @@ #!/bin/bash ./stop.sh -docker-compose up -d +docker compose up -d diff --git a/services/pygeoapi_cite/stop.sh b/services/pygeoapi_cite/stop.sh index 7221e13..c92720f 100755 --- a/services/pygeoapi_cite/stop.sh +++ b/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 diff --git a/services/pygeoapi_covid-19/build.sh b/services/pygeoapi_covid-19/build.sh index 250e4a7..483285d 100755 --- a/services/pygeoapi_covid-19/build.sh +++ b/services/pygeoapi_covid-19/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker-compose build +docker compose build diff --git a/services/pygeoapi_covid-19/docker-compose.yml b/services/pygeoapi_covid-19/docker-compose.yml index 81e22ae..483bd7a 100644 --- a/services/pygeoapi_covid-19/docker-compose.yml +++ b/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 diff --git a/services/pygeoapi_covid-19/start.sh b/services/pygeoapi_covid-19/start.sh index 31d6327..ff757c2 100755 --- a/services/pygeoapi_covid-19/start.sh +++ b/services/pygeoapi_covid-19/start.sh @@ -1,4 +1,4 @@ #!/bin/bash ./stop.sh -docker-compose up -d +docker compose up -d diff --git a/services/pygeoapi_covid-19/stop.sh b/services/pygeoapi_covid-19/stop.sh index 7221e13..c92720f 100755 --- a/services/pygeoapi_covid-19/stop.sh +++ b/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 diff --git a/services/pygeoapi_master/docker-compose.yml b/services/pygeoapi_master/docker-compose.yml index 53aac4d..0f7cd54 100644 --- a/services/pygeoapi_master/docker-compose.yml +++ b/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 diff --git a/services/pygeoapi_master/start.sh b/services/pygeoapi_master/start.sh index 31d6327..ff757c2 100755 --- a/services/pygeoapi_master/start.sh +++ b/services/pygeoapi_master/start.sh @@ -1,4 +1,4 @@ #!/bin/bash ./stop.sh -docker-compose up -d +docker compose up -d diff --git a/services/pygeoapi_master/stop.sh b/services/pygeoapi_master/stop.sh index 7221e13..c92720f 100755 --- a/services/pygeoapi_master/stop.sh +++ b/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 diff --git a/services/pygeoapi_stable/docker-compose.yml b/services/pygeoapi_stable/docker-compose.yml index 4edf31f..b8e7ddf 100644 --- a/services/pygeoapi_stable/docker-compose.yml +++ b/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 diff --git a/services/pygeoapi_stable/start.sh b/services/pygeoapi_stable/start.sh index 31d6327..ff757c2 100755 --- a/services/pygeoapi_stable/start.sh +++ b/services/pygeoapi_stable/start.sh @@ -1,4 +1,4 @@ #!/bin/bash ./stop.sh -docker-compose up -d +docker compose up -d diff --git a/services/pygeoapi_stable/stop.sh b/services/pygeoapi_stable/stop.sh index 7221e13..c92720f 100755 --- a/services/pygeoapi_stable/stop.sh +++ b/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 diff --git a/services/traefik/docker-compose.yml b/services/traefik/docker-compose.yml index 0d3fc97..7907522 100644 --- a/services/traefik/docker-compose.yml +++ b/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 diff --git a/services/traefik/start.sh b/services/traefik/start.sh index f6322b4..f1af8ee 100755 --- a/services/traefik/start.sh +++ b/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 diff --git a/services/traefik/stop.sh b/services/traefik/stop.sh index 56bddeb..6417ac8 100755 --- a/services/traefik/stop.sh +++ b/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}