From d48badd62f1d2f23659039726c13ddb93753c4ac Mon Sep 17 00:00:00 2001 From: Joakim Pettersvold Date: Sat, 9 Nov 2019 20:54:01 +0000 Subject: [PATCH 1/5] Updates docker-compose.yml from traefik v1 to v2 --- docker-compose.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97e4c83..c3f39da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,14 +47,13 @@ services: - ICECAST_PASSWORD=Bk3H7UM8 - ICECAST_RELAY_PASSWORD=hackme labels: - - traefik.enable=true - - traefik.frontend.rule=Host:icecast.radio.dodsorf.as - - traefik.port=8000 - - traefik.backend=icecast - - traefik.domain=dodsorf.as - - traefik.docker.network=reverse - - traefik.frontend.headers.SSLRedirect=true - - traefik.frontend.entryPoints=http,https + - "traefik.enable=true" + - "traefik.http.routers.radio-iceast-http.rule="Host('iceast.radio.dodsorf.as')" + - "traefik.http.services.radio-icecast.loadbalancer.server.port=8000" + - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file" + - "traefik.http.routers.radio-icecast-http.entrypoints=web" + - "traefik.http.routers.radio-icecast-https.entrypoints=websecure" + - "traefik.http.routers.radio-icecast-https.tls.certresolver=normal" networks: - reverse - default @@ -68,14 +67,13 @@ services: volumes: - ./state/playlists:/playlists labels: - - traefik.enable=true - - traefik.frontend.rule=Host:radio.dodsorf.as - - traefik.port=80 - - traefik.backend=webradio - - traefik.domain=dodsorf.as - - traefik.docker.network=reverse - - traefik.frontend.headers.SSLRedirect=true - - traefik.frontend.entryPoints=http,https + - "traefik.enable=true" + - "traefik.http.routers.radio-web-http.rule="Host('radio.dodsorf.as')" + - "traefik.http.services.radio-web.loadbalancer.server.port=80" + - "traefik.http.routers.radio-web-http.middlewares=redirect@file" + - "traefik.http.routers.radio-web-http.entrypoints=web" + - "traefik.http.routers.radio-web-https.entrypoints=websecure" + - "traefik.http.routers.radio-web-https.tls.certresolver=normal" networks: - reverse - default -- 2.44.2 From f4995fd8e42d9340dad7e0b381a17ff3601bde3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Sat, 9 Nov 2019 20:59:10 +0000 Subject: [PATCH 2/5] Update docker-compose.yml --- docker-compose.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index c3f39da..ded8f99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,12 +48,16 @@ services: - ICECAST_RELAY_PASSWORD=hackme labels: - "traefik.enable=true" - - "traefik.http.routers.radio-iceast-http.rule="Host('iceast.radio.dodsorf.as')" + - "traefik.http.services.radio-icecast.loadbalancer.server.port=8000" + - "traefik.http.routers.radio-iceast-http.rule=Host(`iceast.radio.dodsorf.as`)" - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file" - "traefik.http.routers.radio-icecast-http.entrypoints=web" - - "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" + - "traefik.http.routers.radio-icecast-https.entrypoints=websecure" networks: - reverse - default @@ -68,10 +72,14 @@ services: - ./state/playlists:/playlists labels: - "traefik.enable=true" - - "traefik.http.routers.radio-web-http.rule="Host('radio.dodsorf.as')" + - "traefik.http.services.radio-web.loadbalancer.server.port=80" + - "traefik.http.routers.radio-web-http.rule=Host(`radio.dodsorf.as`)" - "traefik.http.routers.radio-web-http.middlewares=redirect@file" - "traefik.http.routers.radio-web-http.entrypoints=web" + + - "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.entrypoints=websecure" - "traefik.http.routers.radio-web-https.tls.certresolver=normal" networks: -- 2.44.2 From f9de3eb0013d8f117d06663c879f1935aa835c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Sat, 9 Nov 2019 21:01:36 +0000 Subject: [PATCH 3/5] Update docker-compose.yml --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ded8f99..ba19ad7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,16 +48,16 @@ services: - ICECAST_RELAY_PASSWORD=hackme labels: - "traefik.enable=true" - - "traefik.http.services.radio-icecast.loadbalancer.server.port=8000" + + - "traefik.http.routers.radio-icecast-http.entrypoints=web" - "traefik.http.routers.radio-iceast-http.rule=Host(`iceast.radio.dodsorf.as`)" - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file" - - "traefik.http.routers.radio-icecast-http.entrypoints=web" + - "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" - - "traefik.http.routers.radio-icecast-https.entrypoints=websecure" networks: - reverse - default @@ -72,15 +72,15 @@ services: - ./state/playlists:/playlists labels: - "traefik.enable=true" - - "traefik.http.services.radio-web.loadbalancer.server.port=80" + + - "traefik.http.routers.radio-web-http.entrypoints=web" - "traefik.http.routers.radio-web-http.rule=Host(`radio.dodsorf.as`)" - "traefik.http.routers.radio-web-http.middlewares=redirect@file" - - "traefik.http.routers.radio-web-http.entrypoints=web" + - "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.entrypoints=websecure" - "traefik.http.routers.radio-web-https.tls.certresolver=normal" networks: - reverse -- 2.44.2 From 5d23de986cdce9005309403058788839d53f3579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Sat, 9 Nov 2019 21:01:57 +0000 Subject: [PATCH 4/5] Update docker-compose.yml --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ba19ad7..d54f127 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,6 +54,7 @@ services: - "traefik.http.routers.radio-iceast-http.rule=Host(`iceast.radio.dodsorf.as`)" - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file" + - "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" @@ -78,6 +79,7 @@ services: - "traefik.http.routers.radio-web-http.rule=Host(`radio.dodsorf.as`)" - "traefik.http.routers.radio-web-http.middlewares=redirect@file" + - "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" -- 2.44.2 From ec6c0826c2628e189a135e1c76be378f95dd18a8 Mon Sep 17 00:00:00 2001 From: Joakim Pettersvold Date: Sat, 9 Nov 2019 21:02:12 +0000 Subject: [PATCH 5/5] Updates docker-compose.yml from traefik v1 to v2 --- docker-compose.yml | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 97e4c83..d54f127 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,14 +47,18 @@ services: - ICECAST_PASSWORD=Bk3H7UM8 - ICECAST_RELAY_PASSWORD=hackme labels: - - traefik.enable=true - - traefik.frontend.rule=Host:icecast.radio.dodsorf.as - - traefik.port=8000 - - traefik.backend=icecast - - traefik.domain=dodsorf.as - - traefik.docker.network=reverse - - traefik.frontend.headers.SSLRedirect=true - - traefik.frontend.entryPoints=http,https + - "traefik.enable=true" + - "traefik.http.services.radio-icecast.loadbalancer.server.port=8000" + + - "traefik.http.routers.radio-icecast-http.entrypoints=web" + - "traefik.http.routers.radio-iceast-http.rule=Host(`iceast.radio.dodsorf.as`)" + - "traefik.http.routers.radio-icecast-http.middlewares=redirect@file" + + + - "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: - reverse - default @@ -68,14 +72,18 @@ services: volumes: - ./state/playlists:/playlists labels: - - traefik.enable=true - - traefik.frontend.rule=Host:radio.dodsorf.as - - traefik.port=80 - - traefik.backend=webradio - - traefik.domain=dodsorf.as - - traefik.docker.network=reverse - - traefik.frontend.headers.SSLRedirect=true - - traefik.frontend.entryPoints=http,https + - "traefik.enable=true" + - "traefik.http.services.radio-web.loadbalancer.server.port=80" + + - "traefik.http.routers.radio-web-http.entrypoints=web" + - "traefik.http.routers.radio-web-http.rule=Host(`radio.dodsorf.as`)" + - "traefik.http.routers.radio-web-http.middlewares=redirect@file" + + + - "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: - reverse - default -- 2.44.2