diff --git a/.gitignore b/.gitignore index 032ece3..dd0f731 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ **/.env* **/*.secret **/*.pw -mounts/ diff --git a/docker-compose.yml b/docker-compose.yaml similarity index 77% rename from docker-compose.yml rename to docker-compose.yaml index 30ed927..1bb7d04 100644 --- a/docker-compose.yml +++ b/docker-compose.yaml @@ -16,22 +16,19 @@ 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 - - koha-memcached + - db + - rabbitmq + - 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.loadbalancer.server.port: 8080 - traefik.http.services.koha-admin-service.loadbalancer.server.port: 8081 + traefik.http.services.koha-opac-service.load-balancer.server.port: 8080 + traefik.http.services.koha-admin-service.load-balancer.server.port: 8081 koha-rabbitmq: image: docker.io/rabbitmq:3 @@ -39,8 +36,6 @@ services: - ./rabbitmq_plugins:/etc/rabbitmq/enabled_plugins networks: - koha - labels: - traefik.enable: false koha-db: image: docker.io/mariadb:11 @@ -54,15 +49,11 @@ 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: