Skip to content

Commit

Permalink
Merge docker workflow into the go one
Browse files Browse the repository at this point in the history
Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
  • Loading branch information
sylr committed Jul 8, 2024
1 parent d9cebf7 commit c37220b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 51 deletions.
49 changes: 0 additions & 49 deletions .github/workflows/docker.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ jobs:
- name: Crossbuild
run: make crossbuild

- name: Build docker image
run: |
make docker-buildx-build
- uses: actions/attest-build-provenance@v1
with:
subject-path: |
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ GO_TOOLS_GOLANGCI_LINT ?= $(shell $(GO) env GOPATH)/bin/golangci-lint

DOCKER_BUILD_IMAGE ?= ghcr.io/sylr/yage
DOCKER_BUILD_VERSION ?= $(GIT_VERSION)
DOCKER_BUILD_GO_VERSION ?= 1.22
DOCKER_BUILD_LABELS = --annotation org.opencontainers.image.title=yage
DOCKER_BUILD_LABELS += --annotation org.opencontainers.image.description="age+yaml"
DOCKER_BUILD_LABELS += --annotation org.opencontainers.image.url="https://github.com/sylr/yage"
Expand Down Expand Up @@ -242,7 +241,7 @@ $(GO_TOOLS_GOLANGCI_LINT):

.PHONY: docker-buildx-build docker-buildx-push docker-buildx-inspect

docker-buildx-build:
docker-buildx-build: crossbuild
@docker buildx build . -f Dockerfile \
-t $(DOCKER_BUILD_IMAGE):$(DOCKER_BUILD_VERSION) \
--platform=$(DOCKER_BUILDX_PLATFORMS) \
Expand Down

0 comments on commit c37220b

Please sign in to comment.