Skip to content

Commit ac8a0c4

Browse files
committed
ci: use standard tags for native images
1 parent 06ff0a8 commit ac8a0c4

File tree

2 files changed

+32
-5
lines changed

2 files changed

+32
-5
lines changed

.github/workflows/verify.yaml

+8-4
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ jobs:
285285
- name: Build Native Images
286286
env:
287287
IMAGE_REPO: quay.io
288-
IMAGE_TAG: latest-snapshot
288+
IMAGE_TAG: 2.6.x-snapshot
289+
ADDITIONAL_IMAGE_TAG: latest-snapshot
289290
run: |
290291
make build-mem-native-image
291292
@@ -296,7 +297,8 @@ jobs:
296297
- name: Push Native Images
297298
env:
298299
IMAGE_REPO: quay.io
299-
IMAGE_TAG: latest-snapshot
300+
IMAGE_TAG: 2.6.x-snapshot
301+
ADDITIONAL_IMAGE_TAG: latest-snapshot
300302
if: github.event_name == 'push'
301303
run: |
302304
make push-mem-native-image
@@ -393,7 +395,8 @@ jobs:
393395
- name: Build Native Images
394396
env:
395397
IMAGE_REPO: quay.io
396-
IMAGE_TAG: latest-snapshot
398+
IMAGE_TAG: 2.6.x-snapshot
399+
ADDITIONAL_IMAGE_TAG: latest-snapshot
397400
run: |
398401
make build-sql-native-image
399402
@@ -404,7 +407,8 @@ jobs:
404407
- name: Push Native Images
405408
env:
406409
IMAGE_REPO: quay.io
407-
IMAGE_TAG: latest-snapshot
410+
IMAGE_TAG: 2.6.x-snapshot
411+
ADDITIONAL_IMAGE_TAG: latest-snapshot
408412
if: github.event_name == 'push'
409413
run: |
410414
make push-sql-native-image

Makefile

+24-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,10 @@ build-mem-native-image:
133133
@echo " Tag: $(IMAGE_TAG)"
134134
@echo "------------------------------------------------------------------------"
135135
docker build -f $(DOCKERFILE_LOCATION)/Dockerfile.native -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem-native:$(IMAGE_TAG) app/
136+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
137+
@echo "Creating additional tag: $(ADDITIONAL_IMAGE_TAG)"
138+
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem-native:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem-native:$(ADDITIONAL_IMAGE_TAG)
139+
endif
136140

137141
.PHONY: build-mem-native-scratch-image ## Builds native docker image from scratch for 'mem' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
138142
build-mem-native-scratch-image:
@@ -161,7 +165,10 @@ push-mem-native-image:
161165
@echo " Tag: $(IMAGE_TAG)"
162166
@echo "------------------------------------------------------------------------"
163167
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem-native:$(IMAGE_TAG)
164-
168+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
169+
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
170+
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem-native:$(ADDITIONAL_IMAGE_TAG)
171+
endif
165172

166173
.PHONY: build-sql-image ## Builds docker image for 'sql' storage variant. Variables available for override [SQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
167174
build-sql-image:
@@ -189,6 +196,10 @@ build-sql-native-image:
189196
@echo " Tag: $(IMAGE_TAG)"
190197
@echo "------------------------------------------------------------------------"
191198
docker build -f $(DOCKERFILE_LOCATION)/Dockerfile.native -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql-native:$(IMAGE_TAG) storage/sql
199+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
200+
@echo "Creating additional tag: $(ADDITIONAL_IMAGE_TAG)"
201+
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql-native:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql-native:$(ADDITIONAL_IMAGE_TAG)
202+
endif
192203

193204
.PHONY: push-sql-native-image ## Pushes native docker image for 'sql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
194205
push-sql-native-image:
@@ -198,6 +209,10 @@ push-sql-native-image:
198209
@echo " Tag: $(IMAGE_TAG)"
199210
@echo "------------------------------------------------------------------------"
200211
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql-native:$(IMAGE_TAG)
212+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
213+
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
214+
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql-native:$(ADDITIONAL_IMAGE_TAG)
215+
endif
201216

202217
.PHONY: build-mssql-image ## Builds docker image for 'mssql' storage variant. Variables available for override [MSSQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
203218
build-mssql-image:
@@ -261,6 +276,10 @@ build-kafkasql-native-image:
261276
@echo " Tag: $(IMAGE_TAG)"
262277
@echo "------------------------------------------------------------------------"
263278
docker build -f $(DOCKERFILE_LOCATION)/Dockerfile.native -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql-native:$(IMAGE_TAG) storage/kafkasql
279+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
280+
@echo "Creating additional tag: $(ADDITIONAL_IMAGE_TAG)"
281+
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql-native:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql-native:$(ADDITIONAL_IMAGE_TAG)
282+
endif
264283

265284
.PHONY: push-kafkasql-native-image ## Pushes native docker image for 'kafkasql' storage variant. Variables available for override [IMAGE_REPO, IMAGE_TAG]
266285
push-kafkasql-native-image:
@@ -270,6 +289,10 @@ push-kafkasql-native-image:
270289
@echo " Tag: $(IMAGE_TAG)"
271290
@echo "------------------------------------------------------------------------"
272291
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql-native:$(IMAGE_TAG)
292+
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
293+
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
294+
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql-native:$(ADDITIONAL_IMAGE_TAG)
295+
endif
273296

274297
.PHONY: build-all-images ## Builds all the Images. Variables available for override [IMAGE_REPO, IMAGE_TAG]
275298
build-all-images: build-mem-image build-sql-image build-mssql-image build-kafkasql-image build-mysql-image

0 commit comments

Comments
 (0)