From ff25c4334b8374267ee1b3c06a9e86fd38e49b94 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 12 Jan 2024 22:39:05 +0100 Subject: [PATCH] Revert "ci: Add bin-image workflow" This reverts commit 15d4c99f3812233379a87ecc2e936ff227218c74. Signed-off-by: Sebastiaan van Stijn --- .github/workflows/build.yml | 47 ------------------------------------- docker-bake.hcl | 23 ------------------ 2 files changed, 70 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8487e4d3c3..8a0d384915 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,9 +4,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true -env: - VERSION: ${{ github.ref }} - on: workflow_dispatch: push: @@ -89,50 +86,6 @@ jobs: path: /tmp/out/* if-no-files-found: error - bin-image: - runs-on: ubuntu-20.04 - if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }} - steps: - - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: dockereng/cli-bin - tags: | - type=semver,pattern={{version}} - type=ref,event=branch - type=ref,event=pr - type=sha - - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }} - password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }} - - - name: Build and push image - uses: docker/bake-action@v4 - with: - files: | - ./docker-bake.hcl - ${{ steps.meta.outputs.bake-file }} - targets: bin-image-cross - push: ${{ github.event_name != 'pull_request' }} - set: | - *.cache-from=type=gha,scope=bin-image - *.cache-to=type=gha,scope=bin-image,mode=max - prepare-plugins: runs-on: ubuntu-20.04 outputs: diff --git a/docker-bake.hcl b/docker-bake.hcl index 8c4af8ce16..b5de2da990 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -165,26 +165,3 @@ target "e2e-gencerts" { dockerfile = "./e2e/testdata/Dockerfile.gencerts" output = ["./e2e/testdata"] } - -target "docker-metadata-action" { - tags = ["cli-bin:local"] -} - -target "bin-image" { - inherits = ["binary", "docker-metadata-action"] - output = ["type=docker"] -} - -target "bin-image-cross" { - inherits = ["bin-image"] - output = ["type=image"] - platforms = [ - "linux/amd64", - "linux/arm/v6", - "linux/arm/v7", - "linux/arm64", - "linux/ppc64le", - "linux/s390x", - "windows/amd64" - ] -}