Skip to content

Commit 88fa938

Browse files
authored
Update the runner init command to be able to run a secondary command after initialisation has completed (#525)
1 parent a457cd3 commit 88fa938

File tree

6 files changed

+324
-21463
lines changed

6 files changed

+324
-21463
lines changed

Makefile

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ build-test-base: export AMD_BASE_IMAGE := gcr.io/distroless/java11
419419
build-test-base: export ARM_BASE_IMAGE := gcr.io/distroless/java11
420420
build-test-base: export PROJECT_URL := $(PROJECT_URL)
421421
build-test-base: export PROJECT_VENDOR := Oracle
422-
build-test-base: export PROJECT_DESCRIPTION := Oracle Coherence bease test image
422+
build-test-base: export PROJECT_DESCRIPTION := Oracle Coherence base test image
423423
build-test-base: build-mvn $(BUILD_BIN)/runner ## Build the Coherence test base image
424424
cp -R $(BUILD_BIN)/linux java/coherence-operator/target/docker
425425
$(CURRDIR)/java/coherence-operator/run-buildah.sh BUILD
@@ -1591,19 +1591,17 @@ endif
15911591
# Push the test base images
15921592
# ----------------------------------------------------------------------------------------------------------------------
15931593
.PHONY: push-test-base-images
1594+
push-test-base-images: export ARTIFACT_DIR := $(CURRDIR)/java/coherence-operator
1595+
push-test-base-images: export VERSION := $(VERSION)
1596+
push-test-base-images: export IMAGE_NAME := $(TEST_BASE_IMAGE)
1597+
push-test-base-images: export AMD_BASE_IMAGE := gcr.io/distroless/java11
1598+
push-test-base-images: export ARM_BASE_IMAGE := gcr.io/distroless/java11
1599+
push-test-base-images: export PROJECT_URL := $(PROJECT_URL)
1600+
push-test-base-images: export PROJECT_VENDOR := Oracle
1601+
push-test-base-images: export PROJECT_DESCRIPTION := Oracle Coherence base test image
15941602
push-test-base-images:
1595-
ifeq ($(TEST_BASE_RELEASE_IMAGE), $(TEST_BASE_IMAGE))
1596-
@echo "Pushing $(TEST_BASE_IMAGE)"
1597-
./mvnw -B -f java/coherence-operator package -P push-test-base-image -pl coherence-operator \
1598-
-DskipTests -Dimage.name=$(TEST_BASE_IMAGE)
1599-
else
1600-
@echo "Tagging $(TEST_BASE_IMAGE)-amd64 as $(TEST_BASE_RELEASE_IMAGE)-amd64"
1601-
docker tag $(TEST_BASE_IMAGE)-amd64 $(TEST_BASE_RELEASE_IMAGE)-amd64
1602-
@echo "Tagging $(TEST_BASE_IMAGE)-arm64 as $(TEST_BASE_RELEASE_IMAGE)-arm64"
1603-
docker tag $(TEST_BASE_IMAGE)-arm64 $(TEST_BASE_RELEASE_IMAGE)-arm64
1604-
./mvnw -B -f java/coherence-operator package -P push-test-base-image -pl coherence-operator \
1605-
-DskipTests -Dimage.name=$(TEST_BASE_RELEASE_IMAGE)
1606-
endif
1603+
cp -R $(BUILD_BIN)/linux java/coherence-operator/target/docker
1604+
$(CURRDIR)/java/coherence-operator/run-buildah.sh PUSH
16071605

16081606
# ----------------------------------------------------------------------------------------------------------------------
16091607
# Push the Operator JIB Test Docker images

0 commit comments

Comments
 (0)