Merge branch 'patch-1' into 'master'

Updates docker-compose.yml from traefik v1 to v2

See merge request dodsorfas/Radio-dodsorfas!11
This commit is contained in:
Daniel Løvbrøtte Olsen 2019-11-09 21:02:12 +00:00
commit 9b0bb1b710
1 changed files with 24 additions and 16 deletions

View File

@ -47,14 +47,18 @@ services:
- ICECAST_PASSWORD=Bk3H7UM8 - ICECAST_PASSWORD=Bk3H7UM8
- ICECAST_RELAY_PASSWORD=hackme - ICECAST_RELAY_PASSWORD=hackme
labels: labels:
- traefik.enable=true - "traefik.enable=true"
- traefik.frontend.rule=Host:icecast.radio.dodsorf.as - "traefik.http.services.radio-icecast.loadbalancer.server.port=8000"
- traefik.port=8000
- traefik.backend=icecast - "traefik.http.routers.radio-icecast-http.entrypoints=web"
- traefik.domain=dodsorf.as - "traefik.http.routers.radio-iceast-http.rule=Host(`iceast.radio.dodsorf.as`)"
- traefik.docker.network=reverse - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file"
- traefik.frontend.headers.SSLRedirect=true
- traefik.frontend.entryPoints=http,https
- "traefik.http.routers.radio-icecast-https.entrypoints=websecure"
- "traefik.http.routers.radio-icecast-https.rule=Host(`icecast.radio.dodsorf.as`)"
- "traefik.http.routers.radio-icecast-https.tls=true"
- "traefik.http.routers.radio-icecast-https.tls.certresolver=normal"
networks: networks:
- reverse - reverse
- default - default
@ -68,14 +72,18 @@ services:
volumes: volumes:
- ./state/playlists:/playlists - ./state/playlists:/playlists
labels: labels:
- traefik.enable=true - "traefik.enable=true"
- traefik.frontend.rule=Host:radio.dodsorf.as - "traefik.http.services.radio-web.loadbalancer.server.port=80"
- traefik.port=80
- traefik.backend=webradio - "traefik.http.routers.radio-web-http.entrypoints=web"
- traefik.domain=dodsorf.as - "traefik.http.routers.radio-web-http.rule=Host(`radio.dodsorf.as`)"
- traefik.docker.network=reverse - "traefik.http.routers.radio-web-http.middlewares=redirect@file"
- traefik.frontend.headers.SSLRedirect=true
- traefik.frontend.entryPoints=http,https
- "traefik.http.routers.radio-web-https.entrypoints=websecure"
- "traefik.http.routers.radio-web-https.rule=Host(`radio.dodsorf.as`)"
- "traefik.http.routers.radio-web-https.tls=true"
- "traefik.http.routers.radio-web-https.tls.certresolver=normal"
networks: networks:
- reverse - reverse
- default - default