Skip to content

Commit 7e348b7

Browse files
committed
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! Add BUILD_REGISTRY option to our build mechanism
Signed-off-by: Jakub Stejskal <[email protected]>
1 parent cc32d7c commit 7e348b7

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

.github/actions/build-strimzi-binaries/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ runs:
3131
uses: actions/cache@v4
3232
with:
3333
path: ~/.m2/repository
34-
key: "maven-cache | ${{ github.run_id }} | **/pom.xml"
34+
key: "maven-cache | ${{ github.job }} | **/pom.xml"
3535
restore-keys: |
36-
maven | ${{ github.run_id }}
36+
maven | ${{ github.job }}
3737
maven
3838
- name: Cache Kafka binaries
3939
uses: actions/cache@v4

.github/actions/containers-load/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ runs:
2626
shell: bash
2727
run: |
2828
eval $(minikube docker-env)
29-
make docker_load docker_tag docker_push docker_create_manifest docker_delete_archive
29+
make docker_load docker_tag docker_push docker_create_test_manifest docker_delete_archive
3030
env:
3131
DOCKER_ARCHITECTURE: ${{ inputs.architecture }}

Makefile.docker

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ docker_amend_manifest_default:
6868
# Create / Amend the manifest
6969
$(DOCKER_CMD) manifest create $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) --amend $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX)
7070

71-
.PHONY: docker_create_manifest_default
72-
docker_create_manifest_default:
71+
.PHONY: docker_create_test_manifest_default
72+
docker_create_test_manifest_default:
7373
# Create the manifest (CI only - TODO - maybe revert?)
7474
$(DOCKER_CMD) manifest create $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG) $(DOCKER_REGISTRY)/$(DOCKER_ORG)/$(PROJECT_NAME):$(DOCKER_TAG)$(DOCKER_PLATFORM_TAG_SUFFIX)
7575

docker-images/base/Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ docker_push:
99
docker_amend_manifest:
1010
# Do nothing
1111

12+
# TODO - revisit
13+
docker_create_test_manifest:
14+
# Do nothing
15+
1216
docker_push_manifest:
1317
# Do nothing
1418

docker-images/kafka-based/Makefile

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ docker_load:
2626
docker_amend_manifest:
2727
./build.sh docker_amend_manifest
2828

29+
# TODO - revisit
30+
docker_create_test_manifest:
31+
./build.sh docker_create_test_manifest
32+
2933
docker_push_manifest:
3034
./build.sh docker_push_manifest
3135

0 commit comments

Comments
 (0)