Skip to content

Merge vNext commits into main #650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 6, 2024
Merged

Merge vNext commits into main #650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8a81d5
Updates for the release of 24.0.0.11
gkertasef Oct 22, 2024
2831228
Updating placeholders and fixing folder structure
gkertasef Oct 23, 2024
dca3598
Removing version from oidcProvider dockerfile
gkertasef Oct 23, 2024
28c25ec
Merge pull request #644 from WASdev/24.0.0.11-release
leochr Oct 23, 2024
49ca062
Merge branch 'main' of github.com:WASdev/ci.docker into port-fix-issu…
leochr Nov 1, 2024
120f859
Merge pull request #648 from WASdev/port-fix-issue-645
leochr Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Ignore .DS_Store
.DS_Store
ga/*/*/resources/*
#ga/*/*/resources/*
28 changes: 14 additions & 14 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-10-17T10:46:47Z",
"generated_at": "2024-10-23T12:31:11Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -97,7 +97,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/full/server.xml": [
"ga/24.0.0.11/full/server.xml": [
{
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
"is_secret": false,
Expand All @@ -107,7 +107,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8": [
"ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -117,7 +117,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11": [
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -127,7 +127,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17": [
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -137,7 +137,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21": [
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -147,7 +147,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk8": [
"ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -157,7 +157,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.ibmjava8": [
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -167,7 +167,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk11": [
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -177,7 +177,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/Dockerfile.ubuntu.openjdk17": [
"ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -187,7 +187,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/helpers/build/configuration_snippets/keystore.xml": [
"ga/24.0.0.11/kernel/helpers/build/configuration_snippets/keystore.xml": [
{
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
"is_secret": false,
Expand All @@ -197,7 +197,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/helpers/build/configuration_snippets/truststore.xml": [
"ga/24.0.0.11/kernel/helpers/build/configuration_snippets/truststore.xml": [
{
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
"is_secret": false,
Expand All @@ -207,7 +207,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/kernel/helpers/runtime/docker-server.sh": [
"ga/24.0.0.11/kernel/helpers/runtime/docker-server.sh": [
{
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
"is_secret": false,
Expand All @@ -217,7 +217,7 @@
"verified_result": null
}
],
"ga/24.0.0.10/oidcProvider/server.xml": [
"ga/24.0.0.11/oidcProvider/server.xml": [
{
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
"is_secret": false,
Expand Down
Empty file modified create-new-release.sh
100644 → 100755
View file
Open in desktop
Empty file.
18 changes: 0 additions & 18 deletions ga/24.0.0.10/images.txt
View file
Open in desktop

This file was deleted.

0 ga/24.0.0.10/README.md → ga/24.0.0.11/README.md
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ga/24.0.0.10/full/Dockerfile.ubi.ibmjava8 → ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE AS installBundle

ARG VERBOSE=false
Expand All @@ -36,7 +36,7 @@ RUN set -eux; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.10/full/Dockerfile.ubi.openjdk11 → ga/24.0.0.11/full/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

ARG VERBOSE=false
Expand All @@ -36,7 +36,7 @@ RUN set -eux; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.10/full/Dockerfile.ubi.openjdk17 → ga/24.0.0.11/full/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

ARG VERBOSE=false
Expand All @@ -36,7 +36,7 @@ RUN set -eux; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.10/full/Dockerfile.ubi.openjdk21 → ga/24.0.0.11/full/Dockerfile.ubi.openjdk21
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal
FROM $PARENT_IMAGE AS installBundle

ARG VERBOSE=false
Expand All @@ -36,7 +36,7 @@ RUN set -eux; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java21-openj9-ubi9-minimal
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.10/full/Dockerfile.ubi.openjdk8 → ga/24.0.0.11/full/Dockerfile.ubi.openjdk8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE AS installBundle

ARG VERBOSE=false
Expand All @@ -36,7 +36,7 @@ RUN set -eux; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.10-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
2 changes: 1 addition & 1 deletion ga/24.0.0.10/full/Dockerfile.ubuntu.ibmjava8 → ga/24.0.0.11/full/Dockerfile.ubuntu.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:24.0.0.10-kernel-java8-ibmjava
FROM websphere-liberty:24.0.0.11-kernel-java8-ibmjava

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
2 changes: 1 addition & 1 deletion ...4.0.0.10/full/Dockerfile.ubuntu.openjdk11 → ...4.0.0.11/full/Dockerfile.ubuntu.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:24.0.0.10-kernel-java11-openj9
FROM websphere-liberty:24.0.0.11-kernel-java11-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
2 changes: 1 addition & 1 deletion ...4.0.0.10/full/Dockerfile.ubuntu.openjdk17 → ...4.0.0.11/full/Dockerfile.ubuntu.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:24.0.0.10-kernel-java17-openj9
FROM websphere-liberty:24.0.0.11-kernel-java17-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
0 ga/24.0.0.10/full/README.md → ga/24.0.0.11/full/README.md
View file
Open in desktop
File renamed without changes.
0 ga/24.0.0.10/full/resources/.gitkeep → ga/24.0.0.11/full/resources/.gitkeep
View file
Open in desktop
File renamed without changes.
0 ga/24.0.0.10/full/server.xml → ga/24.0.0.11/full/server.xml
View file
Open in desktop
File renamed without changes.
18 changes: 18 additions & 0 deletions ga/24.0.0.11/images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
websphere-liberty:24.0.0.11-kernel ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.ibmjava8
websphere-liberty:24.0.0.11-kernel-java11-openj9 ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk11
websphere-liberty:24.0.0.11-kernel-java17-openj9 ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubuntu.openjdk17
websphere-liberty:24.0.0.11-kernel-java8-ibmjava-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8
websphere-liberty:24.0.0.11-kernel-java8-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk8
websphere-liberty:24.0.0.11-kernel-java11-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11
websphere-liberty:24.0.0.11-kernel-java17-openj9-ubi ../ga/24.0.0.11/kernel ../ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17
websphere-liberty:24.0.0.11-full ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.ibmjava8
websphere-liberty:24.0.0.11-full-java11-openj9 ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk11
websphere-liberty:24.0.0.11-full-java17-openj9 ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubuntu.openjdk17
websphere-liberty:24.0.0.11-full-java8-ibmjava-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.ibmjava8
websphere-liberty:24.0.0.11-full-java8-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk8
websphere-liberty:24.0.0.11-full-java11-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk11
websphere-liberty:24.0.0.11-full-java17-openj9-ubi ../ga/24.0.0.11/full ../ga/24.0.0.11/full/Dockerfile.ubi.openjdk17
websphere-liberty:beta ../beta
websphere-liberty:test-stock-quote test-stock-quote
websphere-liberty:test-stock-trader test-stock-trader
websphere-liberty:test-pet-clinic test-pet-clinic
8 changes: 4 additions & 4 deletions ga/24.0.0.10/kernel/Dockerfile.ubi.ibmjava8 → ga/24.0.0.11/kernel/Dockerfile.ubi.ibmjava8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf
ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570

# If there is a local copy of the image use that instead
COPY resources/ /tmp/
Expand All @@ -48,8 +48,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_BUILD_LABEL=cl241020240923-1638
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_BUILD_LABEL=cl241120241021-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
8 changes: 4 additions & 4 deletions ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk11 → ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf
ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570


# If there is a local copy of the image use that instead
Expand All @@ -49,8 +49,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_BUILD_LABEL=cl241020240923-1638
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_BUILD_LABEL=cl241120241021-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
8 changes: 4 additions & 4 deletions ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk17 → ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf
ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570

# If there is a local copy of the image use that instead
COPY resources/ /tmp/
Expand All @@ -48,8 +48,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_BUILD_LABEL=cl241020240923-1638
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_BUILD_LABEL=cl241120241021-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
8 changes: 4 additions & 4 deletions ga/24.0.0.10/kernel/Dockerfile.ubi.openjdk21 → ga/24.0.0.11/kernel/Dockerfile.ubi.openjdk21
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ USER root
ARG VERBOSE=false

# Install WebSphere Liberty
ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=464d34c631faa13b85a78de7058ecaa5dbdbbaaf
ARG LIBERTY_SHA=cc5790346b45f63d093cf8d6a528a7730a1dc570

# If there is a local copy of the image use that instead
COPY resources/ /tmp/
Expand All @@ -47,8 +47,8 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.10
ARG LIBERTY_BUILD_LABEL=cl241020240923-1638
ARG LIBERTY_VERSION=24.0.0.11
ARG LIBERTY_BUILD_LABEL=cl241120241021-1102

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
Loading