Skip to content

Commit 1071320

Browse files
leochrleochr
authored
Merge pull request #709 from WASdev/vNext
Merge vNext commits into main for 25.0.0.8
2 parents c4051f2 + 6889faf commit 1071320

93 files changed

Lines changed: 131 additions & 829 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.secrets.baseline‎

Lines changed: 2 additions & 700 deletions
Large diffs are not rendered by default.

‎ga/25.0.0.7/images.txt‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

ga/25.0.0.7/README.md renamed to ga/25.0.0.8/README.md

File renamed without changes.

ga/25.0.0.7/full/Dockerfile.ubi.ibmjava8 renamed to ga/25.0.0.8/full/Dockerfile.ubi.ibmjava8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-ibmjava-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-ibmjava-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-ibmjava-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-ibmjava-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi.openjdk11 renamed to ga/25.0.0.8/full/Dockerfile.ubi.openjdk11

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java11-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java11-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java11-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java11-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi.openjdk17 renamed to ga/25.0.0.8/full/Dockerfile.ubi.openjdk17

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java17-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java17-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java17-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java17-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi.openjdk8 renamed to ga/25.0.0.8/full/Dockerfile.ubi.openjdk8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-openj9-ubi
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-openj9-ubi
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-openj9-ubi
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-openj9-ubi
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi9-minimal.ibmjava8 renamed to ga/25.0.0.8/full/Dockerfile.ubi9-minimal.ibmjava8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-ibmjava-ubi-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-ibmjava-ubi-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java8-ibmjava-ubi-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java8-ibmjava-ubi-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi9-minimal.openjdk11 renamed to ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk11

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java11-openj9-ubi-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java11-openj9-ubi-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java11-openj9-ubi-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java11-openj9-ubi-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

ga/25.0.0.7/full/Dockerfile.ubi9-minimal.openjdk17 renamed to ga/25.0.0.8/full/Dockerfile.ubi9-minimal.openjdk17

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java17-openj9-ubi-minimal
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java17-openj9-ubi-minimal
1616
FROM $PARENT_IMAGE AS installBundle
1717

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

39-
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.7-kernel-java17-openj9-ubi-minimal
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.8-kernel-java17-openj9-ubi-minimal
4040
FROM $PARENT_IMAGE
4141
ARG VERBOSE=false
4242

0 commit comments

Comments
 (0)