From d4b996017ed8848de3b933888956a45ee77dceeb Mon Sep 17 00:00:00 2001 From: anoracleofra-code Date: Sat, 28 Mar 2026 08:34:14 -0600 Subject: [PATCH] revert: restore original docker-publish.yml to test CI trigger --- .github/workflows/docker-publish.yml | 118 ++++++--------------------- 1 file changed, 24 insertions(+), 94 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index dc79cd8..a7bf5e8 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -6,11 +6,9 @@ on: tags: ["v*.*.*"] pull_request: branches: ["main"] - + env: - GHCR_REGISTRY: ghcr.io - DOCKERHUB_BACKEND: bigbodycobain/shadowbroker-backend - DOCKERHUB_FRONTEND: bigbodycobain/shadowbroker-frontend + REGISTRY: ghcr.io # github.repository as / IMAGE_NAME: ${{ github.repository }} @@ -46,26 +44,19 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.0.0 - - name: Log into GHCR + - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' uses: docker/login-action@v3.0.0 with: - registry: ${{ env.GHCR_REGISTRY }} + registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Log into Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Extract Docker metadata id: meta uses: docker/metadata-action@v5.0.0 with: - images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-frontend + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend - name: Build and push Docker image by digest id: build @@ -77,7 +68,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha,scope=frontend-${{ matrix.platform }} cache-to: type=gha,mode=max,scope=frontend-${{ matrix.platform }} - outputs: type=image,name=${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-frontend,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }} + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }} - name: Export digest if: github.event_name != 'pull_request' @@ -117,56 +108,29 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.0.0 - - name: Log into GHCR + - name: Log into registry ${{ env.REGISTRY }} uses: docker/login-action@v3.0.0 with: - registry: ${{ env.GHCR_REGISTRY }} + registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Log into Docker Hub - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Extract Docker metadata (GHCR) - id: meta-ghcr + - name: Extract Docker metadata + id: meta uses: docker/metadata-action@v5.0.0 with: - images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-frontend + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=raw,value=latest,enable={{is_default_branch}} - - name: Extract Docker metadata (Docker Hub) - id: meta-hub - uses: docker/metadata-action@v5.0.0 - with: - images: ${{ env.DOCKERHUB_FRONTEND }} - tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=raw,value=latest,enable={{is_default_branch}} - - - name: Create and push GHCR manifest + - name: Create and push manifest working-directory: /tmp/digests/frontend run: | docker buildx imagetools create \ $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-frontend@sha256:%s ' *) - env: - DOCKER_METADATA_OUTPUT_JSON: ${{ steps.meta-ghcr.outputs.json }} - - - name: Push to Docker Hub - working-directory: /tmp/digests/frontend - run: | - docker buildx imagetools create \ - $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-frontend@sha256:%s ' *) - env: - DOCKER_METADATA_OUTPUT_JSON: ${{ steps.meta-hub.outputs.json }} + $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-frontend@sha256:%s ' *) build-backend: needs: ci-gate @@ -195,26 +159,19 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.0.0 - - name: Log into GHCR + - name: Log into registry ${{ env.REGISTRY }} if: github.event_name != 'pull_request' uses: docker/login-action@v3.0.0 with: - registry: ${{ env.GHCR_REGISTRY }} + registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Log into Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Extract Docker metadata id: meta uses: docker/metadata-action@v5.0.0 with: - images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-backend + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend - name: Build and push Docker image by digest id: build @@ -227,7 +184,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha,scope=backend-${{ matrix.platform }} cache-to: type=gha,mode=max,scope=backend-${{ matrix.platform }} - outputs: type=image,name=${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-backend,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }} + outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend,push-by-digest=true,name-canonical=true,push=${{ github.event_name != 'pull_request' }} - name: Export digest if: github.event_name != 'pull_request' @@ -267,53 +224,26 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.0.0 - - name: Log into GHCR + - name: Log into registry ${{ env.REGISTRY }} uses: docker/login-action@v3.0.0 with: - registry: ${{ env.GHCR_REGISTRY }} + registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Log into Docker Hub - uses: docker/login-action@v3.0.0 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Extract Docker metadata (GHCR) - id: meta-ghcr + - name: Extract Docker metadata + id: meta uses: docker/metadata-action@v5.0.0 with: - images: ${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-backend + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} type=raw,value=latest,enable={{is_default_branch}} - - name: Extract Docker metadata (Docker Hub) - id: meta-hub - uses: docker/metadata-action@v5.0.0 - with: - images: ${{ env.DOCKERHUB_BACKEND }} - tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=raw,value=latest,enable={{is_default_branch}} - - - name: Create and push GHCR manifest + - name: Create and push manifest working-directory: /tmp/digests/backend run: | docker buildx imagetools create \ $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-backend@sha256:%s ' *) - env: - DOCKER_METADATA_OUTPUT_JSON: ${{ steps.meta-ghcr.outputs.json }} - - - name: Push to Docker Hub - working-directory: /tmp/digests/backend - run: | - docker buildx imagetools create \ - $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.GHCR_REGISTRY }}/${{ env.IMAGE_NAME }}-backend@sha256:%s ' *) - env: - DOCKER_METADATA_OUTPUT_JSON: ${{ steps.meta-hub.outputs.json }} + $(printf '${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-backend@sha256:%s ' *)