From ddfc8e20c0f370d25e7d032b23bef2e3d519506c Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Mon, 13 Sep 2021 13:06:23 -0400 Subject: [PATCH] Revert "disable docker releases (workaround) (#493)" (#501) This reverts commit 06dcd3261dadf77ec0d86e7a981eb4aac7008d09. Signed-off-by: Alex Goodman Signed-off-by: Alex Goodman --- .github/workflows/release.yaml | 12 ++++-------- .goreleaser.yaml | 29 +++++++++++++---------------- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2e87a009f..e4329420e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -94,15 +94,11 @@ jobs: needs: [quality-gate] runs-on: macos-latest # Due to our code signing process, it's vital that we run our release steps on macOS. steps: + - uses: docker-practice/actions-setup-docker@v1 -# we are having an infinite loop of installing docker https://github.com/anchore/syft/actions/runs/1199137004 -# we are still looking for a fix - -# - uses: docker-practice/actions-setup-docker@v1 -# -# # note, it is important to always be auth'd into docker.io to prevent rate limiting issues -# - name: Login to Docker Hub -# run: echo ${{ secrets.TOOLBOX_DOCKER_PASS }} | docker login docker.io -u ${{ secrets.TOOLBOX_DOCKER_USER }} --password-stdin + # note, it is important to always be auth'd into docker.io to prevent rate limiting issues + - name: Login to Docker Hub + run: echo ${{ secrets.TOOLBOX_DOCKER_PASS }} | docker login docker.io -u ${{ secrets.TOOLBOX_DOCKER_USER }} --password-stdin - uses: actions/setup-go@v2 with: diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 2853ab1ee..2317d3bbf 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -91,19 +91,16 @@ brews: homepage: *website description: *description -# we are having an infinite loop of installing docker https://github.com/anchore/syft/actions/runs/1199137004 -# we are still looking for a fix - -#dockers: -# - dockerfile: Dockerfile -# image_templates: -# - "anchore/syft:latest" -# - "anchore/syft:{{ .Tag }}" -# - "anchore/syft:v{{ .Major }}" -# - "anchore/syft:v{{ .Major }}.{{ .Minor }}" -# build_flag_templates: -# - "--build-arg=BUILD_DATE={{.Date}}" -# - "--build-arg=BUILD_VERSION={{.Version}}" -# - "--build-arg=VCS_REF={{.FullCommit}}" -# - "--build-arg=VCS_URL={{.GitURL}}" -# use_buildx: true +dockers: + - dockerfile: Dockerfile + image_templates: + - "anchore/syft:latest" + - "anchore/syft:{{ .Tag }}" + - "anchore/syft:v{{ .Major }}" + - "anchore/syft:v{{ .Major }}.{{ .Minor }}" + build_flag_templates: + - "--build-arg=BUILD_DATE={{.Date}}" + - "--build-arg=BUILD_VERSION={{.Version}}" + - "--build-arg=VCS_REF={{.FullCommit}}" + - "--build-arg=VCS_URL={{.GitURL}}" + use_buildx: true