From 8baa52dfeba5fbf4079459bcb29f0f0923fb43a9 Mon Sep 17 00:00:00 2001 From: oxmox Date: Mon, 4 Sep 2023 18:51:54 +0200 Subject: [PATCH] add non-working forgejo / reenable traefik auth --- docker-compose.yml | 66 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 58 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a84e205..baa3f8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,10 +34,19 @@ services: - "traefik.http.routers.traefik_api.entrypoints=websecure" - "traefik.http.routers.traefik_api.tls.certresolver=myresolver" - "traefik.http.routers.traefik_api.service=api@internal" - - "traefik.http.routers.traefik_api.middlewares=traefik_api_strip" - #- "traefik.http.middlewares.traefik_api_auth.basicauth.users=florian:$$apr1$$x/GrMMGU$$Dn7yVliaRFEwlW17SNh6s." + - "traefik.http.routers.traefik_api.middlewares=traefik_api_auth,traefik_api_strip" + - "traefik.http.middlewares.traefik_api_auth.basicauth.users=florian:$$apr1$$x/GrMMGU$$Dn7yVliaRFEwlW17SNh6s." - "traefik.http.middlewares.traefik_api_strip.stripprefix.prefixes=/traefik/" + whoami: + image: "traefik/whoami" + container_name: "simple-service" + labels: + - "traefik.enable=true" + - "traefik.http.routers.whoami.rule=Host(`oxmox.root.sx`) && Path(`/whoami`)" + - "traefik.http.routers.whoami.entrypoints=websecure" + - "traefik.http.routers.whoami.tls.certresolver=myresolver" + nextcloud-db: image: mariadb:latest container_name: "nextcloud-db" @@ -102,14 +111,53 @@ services: - "traefik.http.middlewares.nextcloud_app_dav.replacepathregex.regex=^/.well-known/ca(l|rd)dav" - "traefik.http.middlewares.nextcloud_app_dav.replacepathregex.replacement=/remote.php/dav/" - whoami: - image: "traefik/whoami" - container_name: "simple-service" + forgejo-db: + image: mariadb:latest + container_name: "forgejo-db" + restart: unless-stopped + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW + volumes: + - ./forgejo/db:/var/lib/mysql + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + environment: + - PUID=1000 + - PGID=1000 + - MYSQL_DATABASE=forgejo + - MYSQL_USER=forgejo + - MYSQL_PASSWORD=forgejo1234 + - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/forgejo_db_root_password + secrets: + - forgejo_db_root_password labels: - "traefik.enable=true" - - "traefik.http.routers.whoami.rule=Host(`oxmox.root.sx`) && Path(`/whoami`)" - - "traefik.http.routers.whoami.entrypoints=websecure" - - "traefik.http.routers.whoami.tls.certresolver=myresolver" + + forgejo-app: + image: codeberg.org/forgejo/forgejo:1.20.3-0 + container_name: "forgejo-app" + restart: unless-stopped + links: + - forgejo-db + volumes: + - ./forgejo/fata:/data + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + environment: + - USER_UID=1000 + - USER_GID=1000 + - FORGEJO__database__DB_TYPE=mysql + - FORGEJO__database__HOST=db:3306 + - FORGEJO__database__NAME=forgejo + - FORGEJO__database__USER=forgejo + - FORGEJO__database__PASSWD=forgejo1234 + labels: + - "traefik.enable=true" + - "traefik.http.routers.forgejo_app.rule=Host(`oxmox.root.sx`) && PathPrefix(`/forge`)" + - "traefik.http.routers.forgejo_app.entrypoints=websecure" + - "traefik.http.routers.forgejo_app.tls.certresolver=myresolver" + - "traefik.http.routers.forgejo_app.middlewares=forgejo_app_strip" + - "traefik.http.middlewares.forgejo_app_strip.stripprefix.prefixes=/forgejo" + - "traefik.http.services.forgejo_app.loadbalancer.server.port=3000" secrets: nextcloud_db_password: @@ -118,6 +166,8 @@ secrets: file: ./secrets/nextcloud_db_root_password nextcloud_admin_password: file: ./secrets/nextcloud_admin_password + forgejo_db_root_password: + file: ./secrets/forgejo_db_root_password #dashboard: