From 315a29c2fde8a4be88aac894cda60eaeb94f242d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 23 Jul 2026 17:08:25 +0200 Subject: [PATCH] Simplify gitea setup --- .github/workflows/ci.yml | 3 ++- docker-compose.override.yml | 29 +++++------------------------ 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c64cdcbf6d..6287a2a669 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -493,7 +493,8 @@ jobs: if: matrix.service.name == 'VCSGitea' timeout-minutes: 5 run: | - docker compose up -d --wait gitea gitea-bootstrap + docker compose up -d --wait gitea + docker compose exec -T gitea /setup.sh CREDS=$(docker compose exec -T gitea cat /data/gitea/oauth.json) CLIENT_SECRET=$(echo "$CREDS" | jq -r .client_secret) echo "::add-mask::$CLIENT_SECRET" diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 069296956b..b8b09cfc18 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -20,11 +20,7 @@ services: - ./src:/usr/src/code/src - ./dev:/usr/src/code/dev depends_on: - coredns: - condition: service_started - gitea-bootstrap: - condition: service_completed_successfully - required: false + - coredns ports: - 9501:80 dns: @@ -351,9 +347,13 @@ services: - 9515:3000 volumes: - appwrite-gitea:/data + - ./dev/gitea/setup.sh:/setup.sh:ro environment: - USER_UID=1000 - USER_GID=1000 + - GITEA_ADMIN_USERNAME=${GITEA_ADMIN_USERNAME:-appwrite} + - GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-password} + - GITEA_ADMIN_EMAIL=${GITEA_ADMIN_EMAIL:-gitea@appwrite.io} - GITEA__database__DB_TYPE=sqlite3 - GITEA__security__INSTALL_LOCK=true - GITEA__service__DISABLE_REGISTRATION=false @@ -373,25 +373,6 @@ services: timeout: 5s retries: 10 start_period: 10s - gitea-bootstrap: - profiles: - - gitea - image: gitea/gitea:1.21.5 - container_name: appwrite-gitea-bootstrap - networks: - - appwrite - volumes: - - appwrite-gitea:/data - - ./dev/gitea/setup.sh:/setup.sh:ro - depends_on: - gitea: - condition: service_healthy - environment: - - GITEA_ADMIN_USERNAME=${GITEA_ADMIN_USERNAME:-appwrite} - - GITEA_ADMIN_PASSWORD=${GITEA_ADMIN_PASSWORD:-password} - - GITEA_ADMIN_EMAIL=${GITEA_ADMIN_EMAIL:-gitea@appwrite.io} - entrypoint: /bin/sh - command: /setup.sh appwrite-mongo-express: profiles: - mongodb