Skip to content

Commit e9e4d50

Browse files
authored
Merge pull request #233 from jetstack/push-all-tags
Modify CI to push multiple tags
2 parents 25b9ef3 + 14200ff commit e9e4d50

File tree

3 files changed

+5
-52
lines changed

3 files changed

+5
-52
lines changed

.github/workflows/release-master.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
push:
66
branches:
77
- master
8-
8+
tags:
9+
- v*
910
jobs:
1011
golint:
1112
name: vet fmt and lint
@@ -55,5 +56,3 @@ jobs:
5556
password: ${{ secrets.QUAY_PASSWORD }}
5657
- name: Build and push
5758
run: make push-docker-image
58-
- name: Tag
59-
run: make create-docker-image-tag NEW_TAG=canary

.github/workflows/release-tag.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,15 @@ build_buildx_args=$(BUILDX_EXTRA_ARGS)
9797
.PHONY: _docker-%
9898
_docker-%: build-all-platforms
9999
docker buildx build --platform $(PLATFORMS) \
100-
--tag $(DOCKER_IMAGE_TAG) \
100+
--tag $(DOCKER_IMAGE):$(VERSION) \
101+
--tag $(DOCKER_IMAGE):latest \
102+
--tag $(DOCKER_IMAGE):canary \
101103
$($*_buildx_args) \
102104
.
103105

104106
build-docker-image: _docker-build
105107
push-docker-image: _docker-push
106108

107-
NEW_TAG?=latest
108-
create-docker-image-tag:
109-
docker buildx imagetools create $(DOCKER_IMAGE):$(COMMIT) --tag $(DOCKER_IMAGE):$(NEW_TAG)
110-
111109
# CI
112110

113111
export PATH:=$(GOPATH)/bin:$(PATH)

0 commit comments

Comments
 (0)