Skip to content

Commit

Permalink
Merge pull request #615 from WASdev/vNext
Browse files Browse the repository at this point in the history 
Merge vNext commits into main
  • Loading branch information
@leochr
leochr authored May 22, 2024
2 parents 9c6413c + 28c241b commit 81e46a7
Show file tree
Hide file tree
Showing 80 changed files with 90 additions and 115 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update_files_for_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
default_author: github_actions
author_name: GitHub Actions
message: "Updates for the release of ${{ inputs.NEW_VERSION }}"
add: '${{ github.workspace }}/ga/* ${{ github.workspace }}/.travis.yml'
add: '${{ github.workspace }}/ga/*'
new_branch: "${{ inputs.NEW_VERSION }}-release"
push: true
tag_push: '--force'
Expand Down
20 changes: 0 additions & 20 deletions .travis.yml
View file

This file was deleted.

1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
[![Build Status](https://travis-ci.org/WASdev/ci.docker.svg?branch=master)](https://travis-ci.org/WASdev/ci.docker)
# WebSphere Application Server Liberty and Containers

- [WebSphere Application Server Liberty and Containers](#websphere-application-server-liberty-and-containers)
Expand Down
4 changes: 0 additions & 4 deletions create-new-release.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do

done

# Update the .travis.yml file.
sed -i'.bak' -e "s/RELEASE=\.\.\/ga\/$OLD_VERSION/RELEASE=\.\.\/ga\/$NEW_VERSION/" ./.travis.yml;
rm ./.travis.yml.bak;

# Update the images.txt file
cp ./ga/$OLD_VERSION/images.txt ./ga/$NEW_VERSION/images.txt;
sed -i'.bak' -e "s/$OLD_VERSION/$NEW_VERSION/g" ./ga/$NEW_VERSION/images.txt;
Expand Down
18 changes: 0 additions & 18 deletions ga/24.0.0.4/images.txt
View file

This file was deleted.

0 ga/24.0.0.4/README.md → ga/24.0.0.5/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ga/24.0.0.4/full/Dockerfile.ubi.ibmjava8 → ga/24.0.0.5/full/Dockerfile.ubi.ibmjava8
View file
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.4-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-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.4-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.4/full/Dockerfile.ubi.openjdk11 → ga/24.0.0.5/full/Dockerfile.ubi.openjdk11
View file
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.4-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-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.4-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.4/full/Dockerfile.ubi.openjdk17 → ga/24.0.0.5/full/Dockerfile.ubi.openjdk17
View file
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.4-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-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.4-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.4/full/Dockerfile.ubi.openjdk21 → ga/24.0.0.5/full/Dockerfile.ubi.openjdk21
View file
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.4-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-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.4-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java21-openj9-ubi9-minimal
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
4 changes: 2 additions & 2 deletions ga/24.0.0.4/full/Dockerfile.ubi.openjdk8 → ga/24.0.0.5/full/Dockerfile.ubi.openjdk8
View file
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.4-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-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.4-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.5-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
2 changes: 1 addition & 1 deletion ga/24.0.0.4/full/Dockerfile.ubuntu.ibmjava8 → ga/24.0.0.5/full/Dockerfile.ubuntu.ibmjava8
View file
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.4-kernel-java8-ibmjava
FROM websphere-liberty:24.0.0.5-kernel-java8-ibmjava

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
2 changes: 1 addition & 1 deletion ga/24.0.0.4/full/Dockerfile.ubuntu.openjdk11 → ga/24.0.0.5/full/Dockerfile.ubuntu.openjdk11
View file
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.4-kernel-java11-openj9
FROM websphere-liberty:24.0.0.5-kernel-java11-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
2 changes: 1 addition & 1 deletion ga/24.0.0.4/full/Dockerfile.ubuntu.openjdk17 → ga/24.0.0.5/full/Dockerfile.ubuntu.openjdk17
View file
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.4-kernel-java17-openj9
FROM websphere-liberty:24.0.0.5-kernel-java17-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
0 ga/24.0.0.4/full/README.md → ga/24.0.0.5/full/README.md
View file
File renamed without changes.
0 ga/24.0.0.4/full/resources/.gitkeep → ga/24.0.0.5/full/resources/.gitkeep
View file
File renamed without changes.
0 ga/24.0.0.4/full/server.xml → ga/24.0.0.5/full/server.xml
View file
File renamed without changes.
18 changes: 18 additions & 0 deletions ga/24.0.0.5/images.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
websphere-liberty:24.0.0.5-kernel ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8
websphere-liberty:24.0.0.5-kernel-java11-openj9 ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubuntu.openjdk11
websphere-liberty:24.0.0.5-kernel-java17-openj9 ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubuntu.openjdk17
websphere-liberty:24.0.0.5-kernel-java8-ibmjava-ubi ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubi.ibmjava8
websphere-liberty:24.0.0.5-kernel-java8-openj9-ubi ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk8
websphere-liberty:24.0.0.5-kernel-java11-openj9-ubi ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk11
websphere-liberty:24.0.0.5-kernel-java17-openj9-ubi ../ga/24.0.0.5/kernel ../ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk17
websphere-liberty:24.0.0.5-full ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubuntu.ibmjava8
websphere-liberty:24.0.0.5-full-java11-openj9 ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubuntu.openjdk11
websphere-liberty:24.0.0.5-full-java17-openj9 ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubuntu.openjdk17
websphere-liberty:24.0.0.5-full-java8-ibmjava-ubi ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubi.ibmjava8
websphere-liberty:24.0.0.5-full-java8-openj9-ubi ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubi.openjdk8
websphere-liberty:24.0.0.5-full-java11-openj9-ubi ../ga/24.0.0.5/full ../ga/24.0.0.5/full/Dockerfile.ubi.openjdk11
websphere-liberty:24.0.0.5-full-java17-openj9-ubi ../ga/24.0.0.5/full ../ga/24.0.0.5/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.4/kernel/Dockerfile.ubi.ibmjava8 → ga/24.0.0.5/kernel/Dockerfile.ubi.ibmjava8
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

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.4/kernel/Dockerfile.ubi.openjdk11 → ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk11
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf


# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

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.4/kernel/Dockerfile.ubi.openjdk17 → ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk17
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

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.4/kernel/Dockerfile.ubi.openjdk21 → ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk21
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

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.4/kernel/Dockerfile.ubi.openjdk8 → ga/24.0.0.5/kernel/Dockerfile.ubi.openjdk8
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
6 changes: 3 additions & 3 deletions ...4.0.0.4/kernel/Dockerfile.ubuntu.ibmjava8 → ...4.0.0.5/kernel/Dockerfile.ubuntu.ibmjava8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
6 changes: 3 additions & 3 deletions ....0.0.4/kernel/Dockerfile.ubuntu.openjdk11 → ....0.0.5/kernel/Dockerfile.ubuntu.openjdk11
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
6 changes: 3 additions & 3 deletions ....0.0.4/kernel/Dockerfile.ubuntu.openjdk17 → ....0.0.5/kernel/Dockerfile.ubuntu.openjdk17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ USER root
ARG VERBOSE=false
ARG OPENJ9_SCC=true

ARG LIBERTY_VERSION=24.0.0.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Thomas Watson, Wendy Raschke, Michal Broz" \
org.opencontainers.image.vendor="IBM" \
Expand Down
0 ga/24.0.0.4/kernel/NOTICES → ga/24.0.0.5/kernel/NOTICES
View file
File renamed without changes.
0 ga/24.0.0.4/kernel/README.md → ga/24.0.0.5/kernel/README.md
View file
File renamed without changes.
0 ga/24.0.0.4/kernel/fixes/.gitkeep → ga/24.0.0.5/kernel/fixes/.gitkeep
View file
File renamed without changes.
0 ....0.0.4/kernel/helpers/build/checkpoint.sh → ....0.0.5/kernel/helpers/build/checkpoint.sh
View file
File renamed without changes.
0 ...nfiguration_snippets/hazelcast-client.xml → ...nfiguration_snippets/hazelcast-client.xml
View file
File renamed without changes.
0 ...iguration_snippets/hazelcast-embedded.xml → ...iguration_snippets/hazelcast-embedded.xml
View file
File renamed without changes.
0 ...nippets/hazelcast-sessioncache-config.xml → ...nippets/hazelcast-sessioncache-config.xml
View file
File renamed without changes.
0 ...ation_snippets/hazelcast-sessioncache.xml → ...ation_snippets/hazelcast-sessioncache.xml
View file
File renamed without changes.
0 .../configuration_snippets/http-endpoint.xml → .../configuration_snippets/http-endpoint.xml
View file
File renamed without changes.
0 ...figuration_snippets/http-ssl-endpoint.xml → ...figuration_snippets/http-ssl-endpoint.xml
View file
File renamed without changes.
0 .../configuration_snippets/iiop-endpoint.xml → .../configuration_snippets/iiop-endpoint.xml
View file
File renamed without changes.
0 ...figuration_snippets/iiop-ssl-endpoint.xml → ...figuration_snippets/iiop-ssl-endpoint.xml
View file
File renamed without changes.
0 ...infinispan-client-sessioncache-config.xml → ...infinispan-client-sessioncache-config.xml
View file
File renamed without changes.
0 ...ippets/infinispan-client-sessioncache.xml → ...ippets/infinispan-client-sessioncache.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/jms-endpoint.xml → ...d/configuration_snippets/jms-endpoint.xml
View file
File renamed without changes.
0 ...nfiguration_snippets/jms-ssl-endpoint.xml → ...nfiguration_snippets/jms-ssl-endpoint.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/keystore.xml → ...build/configuration_snippets/keystore.xml
View file
File renamed without changes.
0 ...onfiguration_snippets/mp-health-check.xml → ...onfiguration_snippets/mp-health-check.xml
View file
File renamed without changes.
0 .../configuration_snippets/mp-monitoring.xml → .../configuration_snippets/mp-monitoring.xml
View file
File renamed without changes.
0 ...ld/configuration_snippets/oidc-config.xml → ...ld/configuration_snippets/oidc-config.xml
View file
File renamed without changes.
0 ...ers/build/configuration_snippets/oidc.xml → ...ers/build/configuration_snippets/oidc.xml
View file
File renamed without changes.
0 ...ration_snippets/sessioncache-features.xml → ...ration_snippets/sessioncache-features.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-facebook.xml → ...d/configuration_snippets/sso-facebook.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-features.xml → ...d/configuration_snippets/sso-features.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-github.xml → ...ild/configuration_snippets/sso-github.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-google.xml → ...ild/configuration_snippets/sso-google.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/sso-linkedin.xml → ...d/configuration_snippets/sso-linkedin.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/sso-oauth2.xml → ...ild/configuration_snippets/sso-oauth2.xml
View file
File renamed without changes.
0 ...build/configuration_snippets/sso-oidc.xml → ...build/configuration_snippets/sso-oidc.xml
View file
File renamed without changes.
0 ...ld/configuration_snippets/sso-twitter.xml → ...ld/configuration_snippets/sso-twitter.xml
View file
File renamed without changes.
0 ...pers/build/configuration_snippets/tls.xml → ...pers/build/configuration_snippets/tls.xml
View file
File renamed without changes.
0 ...d/configuration_snippets/trustDefault.xml → ...d/configuration_snippets/trustDefault.xml
View file
File renamed without changes.
0 ...ild/configuration_snippets/truststore.xml → ...ild/configuration_snippets/truststore.xml
View file
File renamed without changes.
0 ...4.0.0.4/kernel/helpers/build/configure.sh → ...4.0.0.5/kernel/helpers/build/configure.sh
View file
File renamed without changes.
0 ga/24.0.0.4/kernel/helpers/build/features.sh → ga/24.0.0.5/kernel/helpers/build/features.sh
View file
File renamed without changes.
0 .../helpers/build/infinispan-client-setup.sh → .../helpers/build/infinispan-client-setup.sh
View file
File renamed without changes.
0 ...pers/build/internal/features-installed.sh → ...pers/build/internal/features-installed.sh
View file
File renamed without changes.
0 ga/24.0.0.4/kernel/helpers/build/pidplus.sh → ga/24.0.0.5/kernel/helpers/build/pidplus.sh
View file
File renamed without changes.
0 ....0.4/kernel/helpers/build/populate_scc.sh → ....0.5/kernel/helpers/build/populate_scc.sh
View file
File renamed without changes.
0 ...4/kernel/helpers/runtime/docker-server.sh → ...5/kernel/helpers/runtime/docker-server.sh
View file
File renamed without changes.
0 .../kernel/helpers/runtime/restore-server.sh → .../kernel/helpers/runtime/restore-server.sh
View file
File renamed without changes.
0 ga/24.0.0.4/kernel/resources/.gitkeep → ga/24.0.0.5/kernel/resources/.gitkeep
View file
File renamed without changes.
0 ga/24.0.0.4/oidcProvider/Dockerfile → ga/24.0.0.5/oidcProvider/Dockerfile
View file
File renamed without changes.
0 ga/24.0.0.4/oidcProvider/Dockerfile.java11 → ga/24.0.0.5/oidcProvider/Dockerfile.java11
View file
File renamed without changes.
0 ga/24.0.0.4/oidcProvider/README.md → ga/24.0.0.5/oidcProvider/README.md
View file
File renamed without changes.
0 ga/24.0.0.4/oidcProvider/server.xml → ga/24.0.0.5/oidcProvider/server.xml
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions ga/latest/kernel/Dockerfile.ubi.ibmjava8
View file
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.4
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_URL
ARG DOWNLOAD_OPTIONS=""
ARG LIBERTY_SHA=9a153c5e45bb0c6ceed3f4ebe18d4e425d0444a3
ARG LIBERTY_SHA=178f6640f31ca9638ae21f107d0cc8ee7b77fbdf

# 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.4
ARG LIBERTY_BUILD_LABEL=cl240420240408-2000
ARG LIBERTY_VERSION=24.0.0.5
ARG LIBERTY_BUILD_LABEL=cl240520240506-1951

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

0 comments on commit 81e46a7

Please sign in to comment.