From 19956ef6c34293a93c8ce78ecb6ee5792bdc9d5f Mon Sep 17 00:00:00 2001 From: Simon C Date: Thu, 22 Jul 2021 17:36:35 +0200 Subject: [PATCH] feat(HedgeDoc): Simplify docker-compose --- hedgedoc/README.md | 1 - hedgedoc/docker-compose.traefik.yml | 13 ------------- hedgedoc/docker-compose.yml | 5 +++++ 3 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 hedgedoc/docker-compose.traefik.yml diff --git a/hedgedoc/README.md b/hedgedoc/README.md index b36f154..acd8ec8 100644 --- a/hedgedoc/README.md +++ b/hedgedoc/README.md @@ -6,7 +6,6 @@ La configuration est séparé en 3 fichiers : - docker-compose.yml avec le service spécifique à HedgeDoc -- docker-compose.traefik.yml avec la configuration spécifique pour Traefik - ../postgres/docker-compose.yml pour la partie base de donnée ## Configuration diff --git a/hedgedoc/docker-compose.traefik.yml b/hedgedoc/docker-compose.traefik.yml deleted file mode 100644 index 36ec09a..0000000 --- a/hedgedoc/docker-compose.traefik.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: "3.8" - -networks: - default: - name: ${TRAEFIK_NETWORK_NAME:-traefik} - -services: - hedgedoc: - labels: - - traefik.enable=true - - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik} - - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-hedgedoc}.rule=Host(`${HEDGEDOC_DOMAIN:?err}`) - - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-hedgedoc}.entrypoints=web diff --git a/hedgedoc/docker-compose.yml b/hedgedoc/docker-compose.yml index c7dd5f2..5853122 100644 --- a/hedgedoc/docker-compose.yml +++ b/hedgedoc/docker-compose.yml @@ -24,3 +24,8 @@ services: CMD_ALLOW_GRAVATAR: ${CMD_ALLOW_GRAVATAR:-true} CMD_ALLOW_FREEURL: ${CMD_ALLOW_FREEURL:-false} CMD_ALLOW_EMAIL_REGISTER: ${CMD_ALLOW_EMAIL_REGISTER:-true} + labels: + - traefik.enable=true + - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik} + - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-hedgedoc}.rule=Host(`${HEDGEDOC_DOMAIN:?err}`) + - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-hedgedoc}.entrypoints=web