Skip to content

Commit

Permalink
Fix the final image publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
williamdes committed Jan 28, 2024
1 parent 1ffd0ef commit 8aa35b7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
25 changes: 15 additions & 10 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,22 @@ jobs:
# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
#- name: Build and push image
# run: make build-alpine
# env:
# DOCKER_BUILDKIT: 1
# ACTION: push
# PLATFORM: "${{ matrix.platform }}"
# IMAGE_TAG: "docker.io/hickorydns/hickory-dns:${{ matrix.platform-tag }}-latest"
- name: Build and push image
run: make build-alpine
env:
DOCKER_BUILDKIT: 1
ACTION: push
PLATFORM: "${{ matrix.platform }}"
IMAGE_TAG: "docker.io/hickorydns/hickory-dns:${{ matrix.platform-tag }}-latest"
# Disable provenance to remove the attestation from the pushed image
# See: https://github.com/docker/buildx/issues/1509
# It makes: docker.io/botsudo/docker-rustpython:<arch>-latest a manifest list
# And docker manifest create does not like that
EXTRA_ARGS: "--provenance=false"

#- name: Test docker image
# if: ${{ matrix.platform == 'linux/amd64' }}
# run: make test-alpine
- name: Test docker image
if: ${{ matrix.platform == 'linux/amd64' }}
run: make test-alpine

build-and-push-manifest:
name: Build and push the docker hub manifest
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ BUILD_ARGS ?=
PLATFORM ?= linux/amd64
ACTION ?= load
PROGRESS_MODE ?= plain
EXTRA_ARGS ?=

## -- helpers for ENVs possibly used in BUILD_ARGS (manual builds), see README
VERSION ?=
Expand Down Expand Up @@ -42,6 +43,7 @@ build-alpine:
--platform $(PLATFORM) \
--pull \
${BUILD_ARGS} \
$(EXTRA_ARGS) \
--$(ACTION) \
./alpine

Expand Down

0 comments on commit 8aa35b7

Please sign in to comment.