From 916a3a5aa9a0c0ae2ba0f80d55df7c6a919dff05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 23 Jul 2026 16:08:32 +0200 Subject: [PATCH] Introdice gitea container locally and in CICD --- .env | 6 ++-- .github/workflows/ci.yml | 13 +++++-- docker-compose.override.yml | 70 ++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 7 deletions(-) diff --git a/.env b/.env index b48a023df1..6262c41f20 100644 --- a/.env +++ b/.env @@ -155,11 +155,11 @@ _APP_VCS_GITHUB_CLIENT_ID= _APP_VCS_GITHUB_CLIENT_SECRET= _APP_VCS_GITHUB_PRIVATE_KEY=disabled _APP_VCS_GITHUB_WEBHOOK_SECRET= -_APP_VCS_GITEA_ENDPOINT= -_APP_VCS_GITEA_BROWSER_ENDPOINT= +_APP_VCS_GITEA_ENDPOINT=http://gitea:3000 +_APP_VCS_GITEA_BROWSER_ENDPOINT=http://localhost:9515 _APP_VCS_GITEA_CLIENT_ID= _APP_VCS_GITEA_CLIENT_SECRET= -_APP_VCS_GITEA_WEBHOOK_SECRET= +_APP_VCS_GITEA_WEBHOOK_SECRET=gitea-webhook-secret _APP_VCS_GITLAB_CLIENT_ID= _APP_VCS_GITLAB_CLIENT_SECRET= _APP_VCS_GITLAB_WEBHOOK_SECRET= diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eb89ceb31..3b9060a080 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -435,22 +435,29 @@ jobs: echo "_APP_OPTIONS_ROUTER_PROTECTION=enabled" >> $GITHUB_ENV if [ "${{ matrix.database }}" = "MariaDB" ]; then - echo "COMPOSE_PROFILES=mariadb" >> $GITHUB_ENV + COMPOSE_PROFILES=mariadb echo "_APP_DB_ADAPTER=mariadb" >> $GITHUB_ENV echo "_APP_DB_HOST=mariadb" >> $GITHUB_ENV echo "_APP_DB_PORT=3306" >> $GITHUB_ENV elif [ "${{ matrix.database }}" = "MongoDB" ]; then - echo "COMPOSE_PROFILES=mongodb" >> $GITHUB_ENV + COMPOSE_PROFILES=mongodb echo "_APP_DB_ADAPTER=mongodb" >> $GITHUB_ENV echo "_APP_DB_HOST=mongodb" >> $GITHUB_ENV echo "_APP_DB_PORT=27017" >> $GITHUB_ENV elif [ "${{ matrix.database }}" = "PostgreSQL" ]; then - echo "COMPOSE_PROFILES=postgresql" >> $GITHUB_ENV + COMPOSE_PROFILES=postgresql echo "_APP_DB_ADAPTER=postgresql" >> $GITHUB_ENV echo "_APP_DB_HOST=postgresql" >> $GITHUB_ENV echo "_APP_DB_PORT=5432" >> $GITHUB_ENV fi + # Gitea runs alongside Appwrite only where VCS tests need it. + if [ "${{ matrix.service.name }}" = "VCS" ]; then + COMPOSE_PROFILES="${COMPOSE_PROFILES},gitea" + fi + + echo "COMPOSE_PROFILES=${COMPOSE_PROFILES}" >> $GITHUB_ENV + - name: Login to Docker Hub if: ${{ env.DOCKERHUB_AUTH_AVAILABLE == 'true' }} uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0 diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 2613f5f243..aab3eede66 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -19,8 +19,13 @@ services: - ./public:/usr/src/code/public - ./src:/usr/src/code/src - ./dev:/usr/src/code/dev + - appwrite-gitea:/gitea-data:ro depends_on: - - coredns + coredns: + condition: service_started + gitea-bootstrap: + condition: service_completed_successfully + required: false ports: - 9501:80 dns: @@ -331,6 +336,67 @@ services: - 9507:5000 networks: - appwrite + gitea: + profiles: + - gitea + image: gitea/gitea:1.21.5 + container_name: appwrite-gitea + logging: + driver: json-file + options: + max-file: "5" + max-size: 10m + networks: + - appwrite + ports: + - 9515:3000 + volumes: + - appwrite-gitea:/data + environment: + - USER_UID=1000 + - USER_GID=1000 + - GITEA__database__DB_TYPE=sqlite3 + - GITEA__security__INSTALL_LOCK=true + - GITEA__webhook__ALLOWED_HOST_LIST=* + - GITEA__webhook__SKIP_TLS_VERIFY=true + - GITEA__webhook__DELIVER_TIMEOUT=10 + - GITEA__server__ROOT_URL=http://gitea:3000/ + - GITEA__server__LOCAL_ROOT_URL=http://gitea:3000/ + healthcheck: + test: + - CMD + - curl + - -f + - http://localhost:3000/api/healthz + interval: 10s + 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 + 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: > + -c " + su git -c \"gitea admin user create --username $$GITEA_ADMIN_USERNAME --password $$GITEA_ADMIN_PASSWORD --email $$GITEA_ADMIN_EMAIL --admin --must-change-password=false\" || true && + if [ ! -f /data/gitea/token.txt ]; then + TOKEN=$$(su git -c \"gitea admin user generate-access-token --username $$GITEA_ADMIN_USERNAME --token-name $$GITEA_ADMIN_USERNAME-token --scopes all --raw\") && + echo $$TOKEN > /data/gitea/token.txt; + fi + " appwrite-mongo-express: profiles: - mongodb @@ -514,3 +580,5 @@ networks: ipam: config: - subnet: 172.16.238.0/24 +volumes: + appwrite-gitea: null