From eac5e8adc8da2b3f184cad54b9226e305cb65dfe Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Wed, 10 Nov 2021 18:17:44 +0100 Subject: [PATCH 1/3] Add icon server on single domain services --- docker-compose.single-domain.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docker-compose.single-domain.yaml b/docker-compose.single-domain.yaml index 4e85d702..f7c9e429 100644 --- a/docker-compose.single-domain.yaml +++ b/docker-compose.single-domain.yaml @@ -30,6 +30,7 @@ services: UPLOADER_URL: /uploader ADMIN_URL: /admin MAPS_URL: /maps + ICON_URL: /icon STARTUP_COMMAND_1: ./templater.sh STARTUP_COMMAND_2: yarn install TURN_SERVER: "turn:localhost:3478,turns:localhost:5349" @@ -177,6 +178,20 @@ services: redis: image: redis:6 + icon: + image: matthiasluedtke/iconserver:v3.13.0 + labels: + - "traefik.http.middlewares.strip-icon-prefix.stripprefix.prefixes=/icon" + - "traefik.http.routers.icon.rule=PathPrefix(`/icon`)" + - "traefik.http.routers.icon.middlewares=strip-icon-prefix@docker" + - "traefik.http.routers.icon.entryPoints=web" + - "traefik.http.services.icon.loadbalancer.server.port=8080" + - "traefik.http.routers.icon-ssl.rule=PathPrefix(`/icon`)" + - "traefik.http.routers.icon-ssl.middlewares=strip-icon-prefix@docker" + - "traefik.http.routers.icon-ssl.entryPoints=websecure" + - "traefik.http.routers.icon-ssl.tls=true" + - "traefik.http.routers.icon-ssl.service=icon" + # coturn: # image: coturn/coturn:4.5.2 # command: From 2513f8b3d633d5f2a0d383409e573e93b65c2a23 Mon Sep 17 00:00:00 2001 From: Alexis Faizeau Date: Wed, 10 Nov 2021 18:22:03 +0100 Subject: [PATCH 2/3] Add icon server on production docker services --- contrib/docker/docker-compose.prod.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/contrib/docker/docker-compose.prod.yaml b/contrib/docker/docker-compose.prod.yaml index 6b3b8520..0e307dd9 100644 --- a/contrib/docker/docker-compose.prod.yaml +++ b/contrib/docker/docker-compose.prod.yaml @@ -38,6 +38,7 @@ services: JITSI_URL: $JITSI_URL JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE" PUSHER_URL: //pusher.${DOMAIN} + PUSHER_URL: //icon.${DOMAIN} TURN_SERVER: "${TURN_SERVER}" TURN_USER: "${TURN_USER}" TURN_PASSWORD: "${TURN_PASSWORD}" @@ -98,3 +99,15 @@ services: - "traefik.http.routers.back-ssl.service=back" - "traefik.http.routers.back-ssl.tls.certresolver=myresolver" restart: unless-stopped + + icon: + image: matthiasluedtke/iconserver:v3.13.0 + labels: + - "traefik.http.routers.icon.rule=Host(`icon.${DOMAIN}`)" + - "traefik.http.routers.icon.entryPoints=web,traefik" + - "traefik.http.services.icon.loadbalancer.server.port=8080" + - "traefik.http.routers.icon-ssl.rule=Host(`icon.${DOMAIN}`)" + - "traefik.http.routers.icon-ssl.entryPoints=websecure" + - "traefik.http.routers.icon-ssl.tls=true" + - "traefik.http.routers.icon-ssl.service=icon" + - "traefik.http.routers.icon-ssl.tls.certresolver=myresolver" From 64e86411c596e36bb6531f4e83fc035f4ae9dfa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 24 Nov 2021 12:19:45 +0100 Subject: [PATCH 3/3] Fixing env var for ICON_URL --- contrib/docker/docker-compose.prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker/docker-compose.prod.yaml b/contrib/docker/docker-compose.prod.yaml index 0e307dd9..e5a7fb79 100644 --- a/contrib/docker/docker-compose.prod.yaml +++ b/contrib/docker/docker-compose.prod.yaml @@ -38,7 +38,7 @@ services: JITSI_URL: $JITSI_URL JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE" PUSHER_URL: //pusher.${DOMAIN} - PUSHER_URL: //icon.${DOMAIN} + ICON_URL: //icon.${DOMAIN} TURN_SERVER: "${TURN_SERVER}" TURN_USER: "${TURN_USER}" TURN_PASSWORD: "${TURN_PASSWORD}"