From 29aa2de97ef850c4b466bdfdc969f89b338ec1fa Mon Sep 17 00:00:00 2001 From: Sander Schaminee Date: Thu, 16 Mar 2023 13:02:19 +0100 Subject: [PATCH] Uncommented new Docker service (does not work yet) [#52] --- services/pygeoapi/docker-compose.yml | 74 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/services/pygeoapi/docker-compose.yml b/services/pygeoapi/docker-compose.yml index a3bcdfb..8bdf80c 100644 --- a/services/pygeoapi/docker-compose.yml +++ b/services/pygeoapi/docker-compose.yml @@ -41,43 +41,43 @@ services: - "traefik.http.routers.${SERVICE_NAME}_http.rule=Host(`localhost`) && PathPrefix(`${SERVICE_PATH}`)" - "traefik.http.routers.${SERVICE_NAME}_http.entrypoints=http" - adr_pygeoapi: - - image: ${DOCKER_IMAGE} - - container_name: ${SERVICE_NAME_ADR} - - expose: - - "80" - - # ports: - # - "5000:80" - - environment: - # Specific to Flask apps - - SCRIPT_NAME=${SERVICE_PATH_ADR} - - volumes: - # Map data and config into pygeoapi container - - ./local.config.yml:/pygeoapi/local.config.adr.yml - - ./data:/pygeoapi/data - - labels: - # Enable Traefik routing on overlay service network - - "traefik.enable=true" - - "traefik.docker.network=service-network" - - # Define SSL/https router - - "traefik.http.routers.${SERVICE_NAME}_https.rule=Host(`${TRAEFIK_SSL_DOMAIN}`) && PathPrefix(`${SERVICE_PATH_ADR}`)" - - "traefik.http.routers.${SERVICE_NAME}_https.entrypoints=https" - - "traefik.http.routers.${SERVICE_NAME}_https.tls=${TRAEFIK_USE_TLS}" - - "traefik.http.routers.${SERVICE_NAME}_https.tls.certresolver=${TRAEFIK_SSL_CERT_RESOLVER}" - - "traefik.http.routers.${SERVICE_NAME}_https.tls.options=my_default@file" - - "traefik.http.routers.${SERVICE_NAME}_https.middlewares=secure-headers@file" - - # Define local http router - - "traefik.http.routers.${SERVICE_NAME}_http.rule=Host(`localhost`) && PathPrefix(`${SERVICE_PATH_ADR}`)" - - "traefik.http.routers.${SERVICE_NAME}_http.entrypoints=http" +# adr_pygeoapi: +# +# image: ${DOCKER_IMAGE} +# +# container_name: ${SERVICE_NAME_ADR} +# +# expose: +# - "80" +# +# # ports: +# # - "5000:80" +# +# environment: +# # Specific to Flask apps +# - SCRIPT_NAME=${SERVICE_PATH_ADR} +# +# volumes: +# # Map data and config into pygeoapi container +# - ./local.config.yml:/pygeoapi/local.config.adr.yml +# - ./data:/pygeoapi/data +# +# labels: +# # Enable Traefik routing on overlay service network +# - "traefik.enable=true" +# - "traefik.docker.network=service-network" +# +# # Define SSL/https router +# - "traefik.http.routers.${SERVICE_NAME}_https.rule=Host(`${TRAEFIK_SSL_DOMAIN}`) && PathPrefix(`${SERVICE_PATH_ADR}`)" +# - "traefik.http.routers.${SERVICE_NAME}_https.entrypoints=https" +# - "traefik.http.routers.${SERVICE_NAME}_https.tls=${TRAEFIK_USE_TLS}" +# - "traefik.http.routers.${SERVICE_NAME}_https.tls.certresolver=${TRAEFIK_SSL_CERT_RESOLVER}" +# - "traefik.http.routers.${SERVICE_NAME}_https.tls.options=my_default@file" +# - "traefik.http.routers.${SERVICE_NAME}_https.middlewares=secure-headers@file" +# +# # Define local http router +# - "traefik.http.routers.${SERVICE_NAME}_http.rule=Host(`localhost`) && PathPrefix(`${SERVICE_PATH_ADR}`)" +# - "traefik.http.routers.${SERVICE_NAME}_http.entrypoints=http" networks: default: