Skip to content

Commit 0938f78

Browse files
author
Tim Middleton
authored
Update docker images (#112)
* Update docker images * Fix incorrect images
1 parent 036f2e6 commit 0938f78

19 files changed

+408
-174
lines changed

‎.github/workflows/build-compatability-1412.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 17 for Build
4949
uses: actions/setup-java@v4
@@ -78,15 +78,15 @@ jobs:
7878
run: |
7979
echo "Running verify against $COH_VERSION"
8080
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
81-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
81+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
8282
8383
- name: E2E Local Tests With Scope
8484
env:
8585
COH_VERSION: ${{ matrix.coherenceVersion }}
8686
shell: bash
8787
run: |
8888
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
89-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
89+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
9090
9191
- uses: actions/upload-artifact@v4
9292
if: failure()
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
echo "Running verify against $COH_VERSION"
109109
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
110-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
110+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
111111
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
112112
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
113113
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-2206.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 11 for Build
4949
uses: actions/setup-java@v4
@@ -78,15 +78,15 @@ jobs:
7878
run: |
7979
echo "Running verify against $COH_VERSION"
8080
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
81-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-e2e-standalone
81+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax make clean generate-proto build-test-images test-e2e-standalone
8282
8383
- name: E2E Local Tests With Scope
8484
env:
8585
COH_VERSION: ${{ matrix.coherenceVersion }}
8686
shell: bash
8787
run: |
8888
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
89-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
89+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
9090
9191
- uses: actions/upload-artifact@v4
9292
if: failure()
@@ -107,7 +107,7 @@ jobs:
107107
run: |
108108
echo "Running verify against $COH_VERSION"
109109
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
110-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
110+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
111111
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
112112
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
113113
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-v1-1412.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 17 for Build
4949
uses: actions/setup-java@v4
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878
run: |
7979
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
80-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
80+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
8181
8282
- uses: actions/upload-artifact@v4
8383
if: failure()
@@ -91,7 +91,7 @@ jobs:
9191
shell: bash
9292
run: |
9393
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
94-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
94+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,-jakarta,javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
9595
9696
- uses: actions/upload-artifact@v4
9797
if: failure()
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
echo "Running verify against $COH_VERSION"
108108
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
109-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
109+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
110110
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
111111
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
112112
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability-v1.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024,2025 Oracle Corporation and/or its affiliates.
1+
# Copyright 2024, 2025 Oracle Corporation and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at
33
# https://oss.oracle.com/licenses/upl.
44

@@ -25,7 +25,7 @@ jobs:
2525
coherenceVersion:
2626
- 24.09
2727
- 24.09.2
28-
- 24.09.3-SNAPSHOT
28+
- 24.09.4-SNAPSHOT
2929
go-version:
3030
- 1.19.x
3131
- 1.20.x
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 17 for Build
4949
uses: actions/setup-java@v4
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878
run: |
7979
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
80-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
80+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone
8181
8282
- uses: actions/upload-artifact@v4
8383
if: failure()
@@ -91,7 +91,7 @@ jobs:
9191
shell: bash
9292
run: |
9393
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
94-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
94+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-scope
9595
9696
- uses: actions/upload-artifact@v4
9797
if: failure()
@@ -106,7 +106,7 @@ jobs:
106106
run: |
107107
echo "Running verify against $COH_VERSION"
108108
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
109-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
109+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
110110
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
111111
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
112112
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-compatability.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
coherenceVersion:
2626
- 24.09
27-
- 24.09.2
27+
- 24.09.3
2828
go-version:
2929
- 1.19.x
3030
- 1.20.x
@@ -42,7 +42,7 @@ jobs:
4242
- name: Get Docker Images
4343
shell: bash
4444
run: |
45-
docker pull gcr.io/distroless/java17
45+
docker pull gcr.io/distroless/java17-debian12
4646
4747
- name: Set up JDK 17 for Build
4848
uses: actions/setup-java@v4
@@ -76,7 +76,7 @@ jobs:
7676
shell: bash
7777
run: |
7878
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
79-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto build-test-images test-e2e-standalone
79+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax COHERENCE_VERSION=$COH_VERSION make clean generate-proto build-test-images test-e2e-standalone
8080
8181
- uses: actions/upload-artifact@v4
8282
if: failure()
@@ -90,7 +90,7 @@ jobs:
9090
shell: bash
9191
run: |
9292
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
93-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
93+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=$COH_VERSION PROFILES=,jakarta,-javax,scope make clean generate-proto build-test-images test-e2e-standalone-scope
9494
9595
- uses: actions/upload-artifact@v4
9696
if: failure()
@@ -105,7 +105,7 @@ jobs:
105105
run: |
106106
echo "Running verify against $COH_VERSION"
107107
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
108-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
108+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 SECURE=true COHERENCE_IGNORE_INVALID_CERTS=true INCLUDE_LONG_RUNNING=true \
109109
COHERENCE_TLS_CERTS_PATH=`pwd`/test/utils/certs/guardians-ca.crt \
110110
COHERENCE_TLS_CLIENT_CERT=`pwd`/test/utils/certs/star-lord.crt \
111111
COHERENCE_TLS_CLIENT_KEY=`pwd`/test/utils/certs/star-lord.key \

‎.github/workflows/build-queues-1412.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 17 for Build
4949
uses: actions/setup-java@v4
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878
run: |
7979
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
80-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax,queues COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-queues
80+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true PROFILES=,-jakarta,javax,queues COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-queues
8181
8282
- uses: actions/upload-artifact@v4
8383
if: failure()

‎.github/workflows/build-queues.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
matrix:
2525
coherenceVersion:
2626
- 24.09
27-
- 24.09.2
28-
- 24.09.3-SNAPSHOT
27+
- 24.09.3
28+
- 24.09.4-SNAPSHOT
2929
go-version:
3030
- 1.19.x
3131
- 1.20.x
@@ -43,7 +43,7 @@ jobs:
4343
- name: Get Docker Images
4444
shell: bash
4545
run: |
46-
docker pull gcr.io/distroless/java17
46+
docker pull gcr.io/distroless/java17-debian12
4747
4848
- name: Set up JDK 17 for Build
4949
uses: actions/setup-java@v4
@@ -77,7 +77,7 @@ jobs:
7777
shell: bash
7878
run: |
7979
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
80-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax,queues COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-queues
80+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 INCLUDE_LONG_RUNNING=true PROFILES=,jakarta,-javax,queues COHERENCE_VERSION=$COH_VERSION make clean generate-proto generate-proto-v1 build-test-images test-e2e-standalone-queues
8181
8282
- uses: actions/upload-artifact@v4
8383
if: failure()

‎.github/workflows/build-v1.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ jobs:
2626
- 1.22.x
2727
- 1.23.x
2828
coherence-version:
29-
- 24.09
30-
- 24.09.2
31-
- 24.09.3-SNAPSHOT
29+
- 24.09.3
30+
- 24.09.4-SNAPSHOT
3231

3332
# Checkout the source, we need a depth of zero to fetch all of the history otherwise
3433
# the copyright check cannot work out the date of the files from Git.
@@ -40,8 +39,8 @@ jobs:
4039
- name: Get Docker Images
4140
shell: bash
4241
run: |
43-
docker pull gcr.io/distroless/java17
44-
docker pull gcr.io/distroless/java:11
42+
docker pull gcr.io/distroless/java17-debian12
43+
docker pull gcr.io/distroless/java11-debian11
4544
uname -a
4645
4746
- name: Set up JDK
@@ -74,7 +73,7 @@ jobs:
7473
shell: bash
7574
run: |
7675
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
77-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 PROFILES=,jakarta,-javax COHERENCE_VERSION=${{ matrix.coherence-version }} make clean generate-proto generate-proto-v1 build-test-images test-v1-base
76+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 PROFILES=,jakarta,-javax COHERENCE_VERSION=${{ matrix.coherence-version }} make clean generate-proto generate-proto-v1 build-test-images test-v1-base
7877
7978
- uses: actions/upload-artifact@v4
8079
if: failure()

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
- name: Get Docker Images
6363
shell: bash
6464
run: |
65-
docker pull gcr.io/distroless/java17
66-
docker pull gcr.io/distroless/java:11
65+
docker pull gcr.io/distroless/java17-debian12
66+
docker pull gcr.io/distroless/java11-debian11
6767
6868
- name: E2E Local Tests
6969
shell: bash

‎.github/workflows/examples-jakarta-v1.2.2.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023, 2024 Oracle Corporation and/or its affiliates.
1+
# Copyright 2023, 2025 Oracle Corporation and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at
33
# https://oss.oracle.com/licenses/upl.
44

@@ -21,9 +21,8 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
coherenceVersion:
24-
- 24.09
25-
- 24.09.2
26-
- 24.09.3-SNAPSHOT
24+
- 24.09.3
25+
- 24.09.4-SNAPSHOT
2726
go-version:
2827
- 1.19.x
2928
- 1.20.x
@@ -41,7 +40,7 @@ jobs:
4140
- name: Get Docker Images
4241
shell: bash
4342
run: |
44-
docker pull gcr.io/distroless/java17
43+
docker pull gcr.io/distroless/java17-debian12
4544
uname -a
4645
4746
- name: Set up JDK
@@ -77,7 +76,7 @@ jobs:
7776
# Change the jib-maven-plugin as this version fails
7877
sed -i.bak 's/<version.plugin.jib>3\.3\.0<\/version.plugin.jib>/<version.plugin.jib>3.4.3<\/version.plugin.jib>/' java/pom.xml
7978
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
80-
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17 COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,jakarta,-javax make clean generate-proto build-test-images test-cluster-startup test-examples
79+
COHERENCE_BASE_IMAGE=gcr.io/distroless/java17-debian12 COHERENCE_VERSION=${{ matrix.coherenceVersion }} PROFILES=,jakarta,-javax make clean generate-proto build-test-images test-cluster-startup test-examples
8180
make test-cluster-shutdown || true
8281
8382
- uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)