DMC/whisper-frontend
13
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Automatically deploy pull requests for testing #8

Merged
erth9960 merged 44 commits from actions into master 2024-07-08 14:29:41 +02:00
Conversation 1 Commits 44 Files Changed 5 +7 -9
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b36e68851 - Show all commits

16
docker-compose-branch.yml
View File

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