Improvements to virtual host handling

docker-compose-branch.yml

@@ -1,6 +1,5 @@
 services:
   whisper-api:
-    container_name: whisper-api
     build:
       context: .
     environment:
@@ -9,9 +8,9 @@ services:
       - DBPASS=mariadb
       - OAUTH2_CLIENT_ID=whisper-frontend
       - OAUTH2_CLIENT_SECRET=s3cr3t
-      - OAUTH2_AUTH_URI=https://${VHOST}-oauth2.branch.dsv.su.se/authorize
-      - OAUTH2_TOKEN_URI=http://whisper-api-oauth2:8080/exchange
-      - OAUTH2_USER_INFO_URI=http://whisper-api-oauth2:8080/verify
+      - OAUTH2_AUTH_URI=https://oauth2-${VHOST}/authorize
+      - OAUTH2_TOKEN_URI=https://oauth2-${VHOST}/exchange
+      - OAUTH2_USER_INFO_URI=https://oauth2-${VHOST}/verify
     depends_on:
       - whisper-api-db
       - whisper-api-oauth2
@@ -20,12 +19,11 @@ services:
       - traefik
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${VHOST}.rule=Host(`${VHOST}.branch.dsv.su.se`)"
+      - "traefik.http.routers.${VHOST}.rule=Host(`${VHOST}`)"
       - "traefik.http.routers.${VHOST}.entrypoints=secure"
       - "traefik.http.routers.${VHOST}.tls.certresolver=myresolver"
 
   whisper-api-db:
-    container_name: whisper-api-db
     image: mariadb
     restart: on-failure
     networks:
@@ -36,7 +34,6 @@ services:
       - MYSQL_ROOT_HOST=%
 
   whisper-api-oauth2:
-#    container_name: whisper-api-oauth2
     build:
       context: https://github.com/dsv-su/toker.git
       dockerfile: embedded.Dockerfile
@@ -46,10 +43,10 @@ services:
     environment:
       CLIENT_ID: whisper-frontend
       CLIENT_SECRET: s3cr3t
-      CLIENT_REDIRECT_URI: https://${VHOST}.branch.dsv.su.se/login/oauth2/code/su
+      CLIENT_REDIRECT_URI: https://${VHOST}/login/oauth2/code/su
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${VHOST}-oauth2.rule=Host(`${VHOST}-oauth2.branch.dsv.su.se`)"
+      - "traefik.http.routers.${VHOST}-oauth2.rule=Host(`oauth2-${VHOST}`)"
       - "traefik.http.routers.${VHOST}-oauth2.entrypoints=secure"
       - "traefik.http.routers.${VHOST}-oauth2.tls.certresolver=myresolver"
 
@@ -57,3 +54,4 @@ networks:
   whisper-network:
   traefik:
     name: traefik
+    external: true