From 6ac392072f1eaa451b0b36bbba87b560fde7275f Mon Sep 17 00:00:00 2001 From: "D. Scott Boggs" Date: Tue, 13 May 2025 09:33:41 -0400 Subject: [PATCH 1/4] fix container names --- .gitignore | 1 + docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dd0f731..032ece3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ **/.env* **/*.secret **/*.pw +mounts/ diff --git a/docker-compose.yaml b/docker-compose.yaml index 1bb7d04..f91a300 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -17,9 +17,9 @@ services: MEMCACHED_SERVERS: koha-memcached:11211 MB_HOST: koha-rabbitmq depends_on: - - db - - rabbitmq - - memcached + - koha-db + - koha-rabbitmq + - koha-memcached labels: traefik.http.routers.koha-opac.rule: Host(`koha.techwork.zone`) traefik.http.routers.koha-opac.tls.certresolver: letsencrypt_standalone From 5d20a9242865549db3ad1f910a98950ff826e0ad Mon Sep 17 00:00:00 2001 From: "D. Scott Boggs" Date: Tue, 13 May 2025 09:33:56 -0400 Subject: [PATCH 2/4] fix traefik labels --- docker-compose.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f91a300..ba471e8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -21,14 +21,15 @@ services: - koha-rabbitmq - koha-memcached labels: + traefik.enable: true traefik.http.routers.koha-opac.rule: Host(`koha.techwork.zone`) traefik.http.routers.koha-opac.tls.certresolver: letsencrypt_standalone traefik.http.routers.koha-opac.service: koha-opac-service traefik.http.routers.koha-admin.rule: Host(`admin.koha.techwork.zone`) traefik.http.routers.koha-admin.tls.certresolver: letsencrypt_standalone traefik.http.routers.koha-admin.service: koha-admin-service - traefik.http.services.koha-opac-service.load-balancer.server.port: 8080 - traefik.http.services.koha-admin-service.load-balancer.server.port: 8081 + traefik.http.services.koha-opac-service.loadbalancer.server.port: 8080 + traefik.http.services.koha-admin-service.loadbalancer.server.port: 8081 koha-rabbitmq: image: docker.io/rabbitmq:3 @@ -36,6 +37,8 @@ services: - ./rabbitmq_plugins:/etc/rabbitmq/enabled_plugins networks: - koha + labels: + traefik.enable: false koha-db: image: docker.io/mariadb:11 @@ -49,11 +52,15 @@ services: # MARIADB_PASSWORD: # set in .env.prod networks: - koha + labels: + traefik.enable: false koha-memcached: image: docker.io/memcached networks: - koha + labels: + traefik.enable: false volumes: mariadb-koha: From eb3e63959b6edb9a1ebd86ce46b02a9b6a75742d Mon Sep 17 00:00:00 2001 From: "D. Scott Boggs" Date: Tue, 13 May 2025 09:34:25 -0400 Subject: [PATCH 3/4] rename docker-compose.yaml -> docker-compose.yml --- docker-compose.yaml => docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yaml => docker-compose.yml (100%) diff --git a/docker-compose.yaml b/docker-compose.yml similarity index 100% rename from docker-compose.yaml rename to docker-compose.yml From bca5b8871ce046c8b6ea52ead5c4c6d424b23acc Mon Sep 17 00:00:00 2001 From: "D. Scott Boggs" Date: Thu, 22 May 2025 09:02:31 -0400 Subject: [PATCH 4/4] Add config file bind mount --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ba471e8..30ed927 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,8 @@ services: DB_NAME: koha MEMCACHED_SERVERS: koha-memcached:11211 MB_HOST: koha-rabbitmq + volumes: + - ./mounts/koha-sites.conf:/etc/koha/koha-sites.conf:ro depends_on: - koha-db - koha-rabbitmq