Skip to content

Commit 36d4250

Browse files
authored
Fix Makefile (#810)
1 parent 541f875 commit 36d4250

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

Makefile

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2757,7 +2757,8 @@ endif
27572757
# Push the Operator JIB Test Docker images
27582758
# ----------------------------------------------------------------------------------------------------------------------
27592759
.PHONY: push-test-images
2760-
push-test-images: push-basic-test-image
2760+
push-test-images:
2761+
$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE)
27612762
$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_CLIENT)
27622763
$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_HELIDON)
27632764
$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_HELIDON_2)
@@ -2771,19 +2772,6 @@ ifneq (true,$(SKIP_SPRING_CNBP))
27712772
$(DOCKER_CMD) push $(PUSH_ARGS) $(TEST_APPLICATION_IMAGE_SPRING_CNBP_2)
27722773
endif
27732774

2774-
.PHONY: push-basic-test-image
2775-
push-basic-test-image:
2776-
chmod +x $(SCRIPTS_DIR)/buildah/run-buildah.sh
2777-
export IMAGE_NAME=$(TEST_APPLICATION_IMAGE) \
2778-
export IMAGE_NAME_AMD=$(TEST_APPLICATION_IMAGE)-amd64 \
2779-
export IMAGE_NAME_ARM=$(TEST_APPLICATION_IMAGE)-arm64 \
2780-
&& export IMAGE_NAME_REGISTRY=$(OPERATOR_RELEASE_REGISTRY) \
2781-
&& export VERSION=$(VERSION) \
2782-
&& export REVISION=$(GITCOMMIT) \
2783-
&& export NO_DOCKER_DAEMON=$(NO_DOCKER_DAEMON) \
2784-
&& export DOCKER_CMD=$(DOCKER_CMD) \
2785-
&& $(SCRIPTS_DIR)/buildah/run-buildah.sh PUSH
2786-
27872775
# ----------------------------------------------------------------------------------------------------------------------
27882776
# Push the Operator Test images to ttl.sh
27892777
# ----------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)