Skip to content

Commit

Permalink
Fixed on trigger
Browse files Browse the repository at this point in the history
  • Loading branch information
teroahonen-vungle committed Oct 18, 2024
1 parent add4a38 commit ea2366d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: Test images
on:
push:
branches:
- "!mmaster"
- '*'
- '!master'
workflow_dispatch:
jobs:
build-and-publish:
strategy:
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ ifdef LABEL
LABEL := -$(LABEL)
endif

BUILDX_ARG_PUSH = '--push'

.PHONY: all test clean

Expand All @@ -24,14 +25,14 @@ build-multiarch: _prepare-multiarch
@docker buildx build \
$(BUILD_OPTS) \
--platform linux/amd64,linux/arm64 \
--push \
$(BUILDX_ARG_PUSH) \
-t "$(PROJECT_BASE):$(VERSION)" \
-t "$(PROJECT_BASE):$(MAJOR).$(MINOR)$(LABEL)" \
.
@docker buildx build \
$(BUILD_OPTS) \
--platform linux/amd64,linux/arm64 \
--push \
$(BUILDX_ARG_PUSH) \
-t "$(PROJECT_BASE):$(VERSION)" \
-t "$(PROJECT_BASE):$(MAJOR).$(MINOR)$(LABEL)-alpine" \
-f Dockerfile.alpine \
Expand Down

0 comments on commit ea2366d

Please sign in to comment.