Skip to content

Commit 98764e1

Browse files
committed
ci: fix issues in GH workflows
Also see: docker/buildx#1152
1 parent b3b88b6 commit 98764e1

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

.github/workflows/update-openapi.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
git config --global user.email "apicurio.ci@gmail.com"
2323
git remote add origin "https://apicurio-ci:${{ secrets.ACCESS_TOKEN }}@github.com/Apicurio/apicurio-registry.git"
2424
git fetch
25-
git checkout main
26-
git branch --set-upstream-to=origin/main
25+
git checkout 2.6.x
26+
git branch --set-upstream-to=origin/2.6.x
2727
git pull
2828
2929
- name: Set up JDK 17
@@ -61,7 +61,3 @@ jobs:
6161
validate:
6262
needs: update-openapi
6363
uses: ./.github/workflows/validate-openapi.yaml
64-
65-
dispatch:
66-
needs: validate
67-
uses: ./.github/workflows/dispatch-openapi.yaml

Makefile

+10-15
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,8 @@ mem-multiarch-images:
289289
@echo "------------------------------------------------------------------------"
290290
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MEM_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem:$(IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
291291
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
292-
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
293-
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem:$(ADDITIONAL_IMAGE_TAG)
294-
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem:$(ADDITIONAL_IMAGE_TAG)
292+
@echo "Publishing additional tag: $(ADDITIONAL_IMAGE_TAG)"
293+
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MEM_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mem:$(ADDITIONAL_IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
295294
endif
296295

297296
.PHONY: sql-multiarch-images ## Builds and pushes multi-arch images for 'sql' storage variant. Variables available for override [SQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
@@ -305,9 +304,8 @@ sql-multiarch-images:
305304
@echo "------------------------------------------------------------------------"
306305
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(SQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql:$(IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
307306
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
308-
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
309-
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql:$(ADDITIONAL_IMAGE_TAG)
310-
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql:$(ADDITIONAL_IMAGE_TAG)
307+
@echo "Publishing additional tag: $(ADDITIONAL_IMAGE_TAG)"
308+
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(SQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-sql:$(ADDITIONAL_IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
311309
endif
312310

313311
.PHONY: mssql-multiarch-images ## Builds and pushes multi-arch images for 'mssql' storage variant. Variables available for override [MSSQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
@@ -321,9 +319,8 @@ mssql-multiarch-images:
321319
@echo "------------------------------------------------------------------------"
322320
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MSSQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mssql:$(IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
323321
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
324-
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
325-
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mssql:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mssql:$(ADDITIONAL_IMAGE_TAG)
326-
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mssql:$(ADDITIONAL_IMAGE_TAG)
322+
@echo "Publishing additional tag: $(ADDITIONAL_IMAGE_TAG)"
323+
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MSSQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mssql:$(ADDITIONAL_IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
327324
endif
328325

329326
.PHONY: mysql-multiarch-images ## Builds and pushes multi-arch images for 'mysql' storage variant. Variables available for override [MYSQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
@@ -337,9 +334,8 @@ mysql-multiarch-images:
337334
@echo "------------------------------------------------------------------------"
338335
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MYSQL_DOCKERFILE) -t $(IMAGE_REPO)/apicurio/apicurio-registry-mysql:$(IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
339336
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
340-
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
341-
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mysql:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mysql:$(ADDITIONAL_IMAGE_TAG)
342-
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-mysql:$(ADDITIONAL_IMAGE_TAG)
337+
@echo "Publishing additional tag: $(ADDITIONAL_IMAGE_TAG)"
338+
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(MYSQL_DOCKERFILE) -t $(IMAGE_REPO)/apicurio/apicurio-registry-mysql:$(ADDITIONAL_IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
343339
endif
344340

345341
.PHONY: kafkasql-multiarch-images ## Builds and pushes multi-arch images for kafkasql storage variant. Variables available for override [KAFKASQL_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]
@@ -353,9 +349,8 @@ kafkasql-multiarch-images:
353349
@echo "------------------------------------------------------------------------"
354350
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(KAFKASQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql:$(IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
355351
ifneq ($(ADDITIONAL_IMAGE_TAG), none)
356-
@echo "Pushing additional tag: $(ADDITIONAL_IMAGE_TAG)"
357-
docker tag $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql:$(IMAGE_TAG) $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql:$(ADDITIONAL_IMAGE_TAG)
358-
docker push $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql:$(ADDITIONAL_IMAGE_TAG)
352+
@echo "Publishing additional tag: $(ADDITIONAL_IMAGE_TAG)"
353+
docker buildx build --push -f $(DOCKERFILE_LOCATION)/$(KAFKASQL_DOCKERFILE) -t $(IMAGE_REPO)/$(IMAGE_GROUP)/apicurio-registry-kafkasql:$(ADDITIONAL_IMAGE_TAG) --platform $(IMAGE_PLATFORMS) $(DOCKER_BUILD_WORKSPACE)
359354
endif
360355

361356
.PHONY: mem-native-scratch-image ## Builds and pushes multi-arch images for mem storage variant based on scratch. Variables available for override [MEM_SCRATCH_DOCKERFILE, IMAGE_REPO, IMAGE_TAG, DOCKER_BUILD_WORKSPACE]

0 commit comments

Comments
 (0)