Merge pull request 'Update HedgeDoc to import it with extends' (#1) from hedgedoc into master

Reviewed-on: https://git.weko.io/weko/services/pulls/1
This commit is contained in:
Simon 2021-07-23 12:31:32 +02:00
commit d9f6a5c3fd
4 changed files with 12 additions and 16 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,5 @@
version: "3.8"
networks:
default:
name: ${TRAEFIK_NETWORK_NAME:-traefik}