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..cb82d71 100644 --- a/hedgedoc/docker-compose.yml +++ b/hedgedoc/docker-compose.yml @@ -9,8 +9,8 @@ services: container_name: ${HEDGEDOC_CONTAINER_NAME:-hedgedoc} image: ${HEDGEDOC_IMAGE:-linuxserver/hedgedoc:1.8.2-ls22} restart: always - depends_on: - - postgres + # depends_on: # It's commented because docker `extends` don't support it + # - postgres volumes: - hedgedoc:/config - /etc/timezone:/etc/timezone:ro @@ -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 diff --git a/traefik/docker-compose.network.yml b/traefik/docker-compose.network.yml new file mode 100644 index 0000000..dd2f831 --- /dev/null +++ b/traefik/docker-compose.network.yml @@ -0,0 +1,5 @@ +version: "3.8" + +networks: + default: + name: ${TRAEFIK_NETWORK_NAME:-traefik}