diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index a6e19f427..e615e5fbe 100755 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -823,22 +823,6 @@ jobs: - name: Build and push API image (buildx cache) shell: sh run: "set -eu\nREGISTRY=\"git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas\"\nIMAGE_TAG=\"${REGISTRY}/xiaoxia-saas-api:${GITHUB_SHA}\"\nCACHE_REF=\"${REGISTRY}/api-cache:${GITHUB_REF_NAME}\"\n\nbash scripts/ci/docker_build_push.sh \\\n infra/docker/api.Dockerfile \\\n \"${IMAGE_TAG}\" \\\n \"${CACHE_REF}\" \\\n APP_VERSION=\"${GITHUB_SHA}\"\n\necho\necho \"API image pushed: ${IMAGE_TAG}\"" - - REGISTRY="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas" - - IMAGE_NAME="xiaoxia-saas-api" - - VERSION="${GITHUB_REF_NAME}" - - CACHE_REF="${REGISTRY}/api-cache:main" - - - echo "Building Production API image: ${VERSION}" - - docker buildx build --build-arg APP_VERSION="${VERSION}" --cache-from "type=registry,ref=${CACHE_REF},ignore-error=true" --cache-to "type=registry,ref=${CACHE_REF},mode=max" -f infra/docker/api.Dockerfile -t "${REGISTRY}/${IMAGE_NAME}:${VERSION}" --push . - - echo "Production API image pushed: ${REGISTRY}/${IMAGE_NAME}:${VERSION}" - ' - name: Job duration summary if: always() @@ -898,22 +882,6 @@ jobs: - name: Build and push Worker image (buildx cache) shell: sh run: "set -eu\nREGISTRY=\"git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas\"\nIMAGE_TAG=\"${REGISTRY}/xiaoxia-saas-worker:${GITHUB_SHA}\"\nCACHE_REF=\"${REGISTRY}/worker-cache:${GITHUB_REF_NAME}\"\n\nbash scripts/ci/docker_build_push.sh \\\n infra/docker/worker.Dockerfile \\\n \"${IMAGE_TAG}\" \\\n \"${CACHE_REF}\" \\\n APP_VERSION=\"${GITHUB_SHA}\"\n\necho\necho \"Worker image pushed: ${IMAGE_TAG}\"" - - REGISTRY="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas" - - IMAGE_NAME="xiaoxia-saas-worker" - - VERSION="${GITHUB_REF_NAME}" - - CACHE_REF="${REGISTRY}/worker-cache:main" - - - echo "Building Production Worker image: ${VERSION}" - - docker buildx build --build-arg APP_VERSION="${VERSION}" --cache-from "type=registry,ref=${CACHE_REF},ignore-error=true" --cache-to "type=registry,ref=${CACHE_REF},mode=min" -f infra/docker/worker.Dockerfile -t "${REGISTRY}/${IMAGE_NAME}:${VERSION}" --push . - - echo "Production Worker image pushed: ${REGISTRY}/${IMAGE_NAME}:${VERSION}" - ' - name: Job duration summary if: always() @@ -976,24 +944,6 @@ jobs: - name: Build and push Web image (buildx cache) shell: sh run: "set -eu\nREGISTRY=\"git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas\"\nIMAGE_TAG=\"${REGISTRY}/xiaoxia-saas-web:${GITHUB_SHA}\"\nCACHE_REF=\"${REGISTRY}/web-cache:${GITHUB_REF_NAME}\"\n\nbash scripts/ci/docker_build_push.sh \\\n infra/docker/web.Dockerfile \\\n \"${IMAGE_TAG}\" \\\n \"${CACHE_REF}\" \\\n APP_VERSION=\"${GITHUB_SHA}\"\n\necho\necho \"Web image pushed: ${IMAGE_TAG}\"" - - REGISTRY="git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas" - - IMAGE_NAME="xiaoxia-saas-web" - - VERSION="${GITHUB_REF_NAME}" - - CACHE_REF="${REGISTRY}/web-cache:main" - - NGINX_CONF="infra/docker/nginx-production.conf" - - - echo "Building Production Web image: ${VERSION}" - - docker buildx build --cache-from "type=registry,ref=${CACHE_REF},ignore-error=true" --cache-to "type=registry,ref=${CACHE_REF},mode=max" -f infra/docker/web-artifact.Dockerfile --build-arg "NGINX_CONF=${NGINX_CONF}" -t "${REGISTRY}/${IMAGE_NAME}:${VERSION}" --push . - - echo "Production Web image pushed: ${REGISTRY}/${IMAGE_NAME}:${VERSION}" - ' - name: Cleanup old Docker images if: always()