Skip to content

Commit f1a4df2

Browse files
author
Tim Middleton
authored
Fix issue running federation images locally (#344)
1 parent 6e05eaa commit f1a4df2

File tree

3 files changed

+17
-23
lines changed

3 files changed

+17
-23
lines changed

java/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
<version>${version.plugin.jib}</version>
375375
<configuration>
376376
<from>
377-
<image>${coherence.test.base.image}</image>
377+
<image>docker://${coherence.test.base.image}</image>
378378
</from>
379379
<container>
380380
<jvmFlags>
@@ -418,7 +418,7 @@
418418
<version>${version.plugin.jib}</version>
419419
<configuration>
420420
<from>
421-
<image>${coherence.test.base.image}</image>
421+
<image>docker://${coherence.test.base.image}</image>
422422
</from>
423423
<container>
424424
<jvmFlags>

scripts/run-compat-ce.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
#
4-
# Copyright (c) 2021, 2024 Oracle and/or its affiliates.
4+
# Copyright (c) 2021, 2025 Oracle and/or its affiliates.
55
# Licensed under the Universal Permissive License v 1.0 as shown at
66
# https://oss.oracle.com/licenses/upl.
77
#
@@ -24,11 +24,11 @@ COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,executor COHERE
2424
echo "Coherence CE 14.1.1-0-19"
2525
COHERENCE_VERSION=14.1.1-0-19 make clean build-test-images test-e2e-standalone
2626

27-
echo "Coherence CE 24.09.3 with Topics"
28-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,topics COHERENCE_VERSION=24.09.3 make clean build-test-images test-e2e-topics
27+
echo "Coherence CE 25.03.1 with Topics"
28+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,topics COHERENCE_VERSION=25.03.1 make clean build-test-images test-e2e-topics
2929

30-
echo "Coherence CE 24.09.3 with View Caches"
31-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,views COHERENCE_VERSION=24.09.3 make clean build-view-images test-e2e-views
30+
echo "Coherence CE 25.03.1 with View Caches"
31+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,views COHERENCE_VERSION=25.03.1 make clean build-view-images test-e2e-views
3232

3333
# Security Enabled
3434
export COMPUTERNAME=server1

scripts/run-compat-commercial.sh

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,18 @@
99
# Run compatability tests
1010
set -e
1111

12-
echo "Coherence GE 14.1.1-0-19"
13-
PROFILES=,commercial COHERENCE_VERSION=14.1.1-0-19 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-test-images test-e2e-standalone
14-
15-
echo "Coherence GE 12.2.1-4-23"
16-
PROFILES=,commercial COHERENCE_VERSION=12.2.1-4-23 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-test-images test-e2e-standalone
12+
echo "Coherence GE 14.1.2-0-3"
13+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,commercial COHERENCE_VERSION=14.1.2-0-3 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-test-images test-e2e-standalone
1714

1815
# Federation Tests
19-
echo "Coherence Federation Test GE 14.1.1-0-19"
20-
PROFILES=,federation COHERENCE_VERSION=14.1.1-0-19 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-federation-images test-e2e-federation
21-
22-
echo "Coherence Federation Test GE 12.2.1-4-23"
23-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,federation COHERENCE_VERSION=12.2.1-4-23 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-federation-images test-e2e-federation
16+
echo "Coherence Federation Test GE 14.1.2-0-3"
17+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,federation COHERENCE_VERSION=14.1.2-0-3 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-federation-images test-e2e-federation
2418

25-
echo "Coherence Federation Test 14.1.2-0-2"
26-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,federation COHERENCE_VERSION=14.1.2-0-2 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-federation-images test-e2e-federation
19+
echo "Coherence Federation Test 14.1.2-0-3"
20+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,federation COHERENCE_VERSION=14.1.2-0-3 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-federation-images test-e2e-federation
2721

28-
echo "Coherence GE 14.1.2-0-2with topics"
29-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,topics-commercial COHERENCE_VERSION=14.1.2-0-2COHERENCE_GROUP_ID=com.oracle.coherence make clean build-test-images test-e2e-topics
22+
echo "Coherence GE 14.1.2-0-3 with topics"
23+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,topics-commercial COHERENCE_VERSION=14.1.2-0-3 COHERENCE_GROUP_ID=com.oracle.coherence make clean build-test-images test-e2e-topics
3024

31-
echo "Coherence GE 14.1.2-0-2with views"
32-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,views COHERENCE_GROUP_ID=com.oracle.coherence COHERENCE_VERSION=14.1.2-0-2make clean build-view-images test-e2e-views
25+
echo "Coherence GE 14.1.2-0-3 with views"
26+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,views COHERENCE_GROUP_ID=com.oracle.coherence COHERENCE_VERSION=14.1.2-0-3 make clean build-view-images test-e2e-views

0 commit comments

Comments
 (0)