Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-01-14T17:18:06Z",
"generated_at": "2025-02-11T19:28:37Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -373,7 +373,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/full/server.xml": [
"ga/25.0.0.2/full/server.xml": [
{
"hashed_secret": "d1bbd0d69a08402e6c1fc2d1bc5a5ea5c3a7ea13",
"is_secret": false,
Expand All @@ -383,7 +383,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubi.ibmjava8": [
"ga/25.0.0.2/kernel/Dockerfile.ubi.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -393,7 +393,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk11": [
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -403,7 +403,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk17": [
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -413,7 +413,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk21": [
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk21": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -423,7 +423,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubi.openjdk8": [
"ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -433,7 +433,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.ibmjava8": [
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -443,7 +443,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.openjdk11": [
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk11": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -453,7 +453,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/Dockerfile.ubuntu.openjdk17": [
"ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk17": [
{
"hashed_secret": "7083d74c46835f9b94206ff41e2e54ff946d6683",
"is_secret": false,
Expand All @@ -463,7 +463,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/helpers/build/configuration_snippets/keystore.xml": [
"ga/25.0.0.2/kernel/helpers/build/configuration_snippets/keystore.xml": [
{
"hashed_secret": "3cacc7bfac0a382c669a884c953d0401a689785d",
"is_secret": false,
Expand All @@ -473,7 +473,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/helpers/build/configuration_snippets/truststore.xml": [
"ga/25.0.0.2/kernel/helpers/build/configuration_snippets/truststore.xml": [
{
"hashed_secret": "662e721e5b6494888b2792ea3b8a1fa310f6ea45",
"is_secret": false,
Expand All @@ -483,7 +483,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/kernel/helpers/runtime/docker-server.sh": [
"ga/25.0.0.2/kernel/helpers/runtime/docker-server.sh": [
{
"hashed_secret": "ad321232b1e4e90a29208e1f70d06aad788caa16",
"is_secret": false,
Expand All @@ -493,7 +493,7 @@
"verified_result": null
}
],
"ga/25.0.0.1/oidcProvider/server.xml": [
"ga/25.0.0.2/oidcProvider/server.xml": [
{
"hashed_secret": "1511e358bea6f50b2ddb2ca19c6422e871a0086f",
"is_secret": false,
Expand Down
60 changes: 30 additions & 30 deletions docs/icr-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The `latest` tag simplifies pulling the full latest Open Liberty release with th

Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example,
```
icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java17-openj9-ubi
```

Available images can be listed using [IBM Cloud CLI](https://cloud.ibm.com/docs/cli?topic=cli-getting-started). Log in with your IBMid prior to running the following commands. Note that authentication is only required to list the images. **Images can be pulled from ICR without authentication** :
Expand All @@ -30,7 +30,7 @@ ibmcloud cr images --restrict appcafe/websphere-liberty

## Latest version

The following tags include the most recent WebSphere Liberty version: `24.0.0.10`
The following tags include the most recent WebSphere Liberty version: `25.0.0.1`

```
kernel-java21-openj9-ubi-minimal
Expand All @@ -48,20 +48,36 @@ full-java8-ibmjava-ubi
latest
```

## 24.0.0.10
## 25.0.0.1

```
24.0.0.10-kernel-java21-openj9-ubi-minimal
24.0.0.10-kernel-java17-openj9-ubi
24.0.0.10-kernel-java11-openj9-ubi
24.0.0.10-kernel-java8-ibmjava-ubi
24.0.0.10-kernel-java8-openj9-ubi

24.0.0.10-full-java21-openj9-ubi-minimal
24.0.0.10-full-java17-openj9-ubi
24.0.0.10-full-java11-openj9-ubi
24.0.0.10-full-java8-openj9-ubi
24.0.0.10-full-java8-ibmjava-ubi
25.0.0.1-kernel-java21-openj9-ubi-minimal
25.0.0.1-kernel-java17-openj9-ubi
25.0.0.1-kernel-java11-openj9-ubi
25.0.0.1-kernel-java8-ibmjava-ubi
25.0.0.1-kernel-java8-openj9-ubi

25.0.0.1-full-java21-openj9-ubi-minimal
25.0.0.1-full-java17-openj9-ubi
25.0.0.1-full-java11-openj9-ubi
25.0.0.1-full-java8-openj9-ubi
25.0.0.1-full-java8-ibmjava-ubi
```

## 24.0.0.12

```
24.0.0.12-kernel-java21-openj9-ubi-minimal
24.0.0.12-kernel-java17-openj9-ubi
24.0.0.12-kernel-java11-openj9-ubi
24.0.0.12-kernel-java8-ibmjava-ubi
24.0.0.12-kernel-java8-openj9-ubi

24.0.0.12-full-java21-openj9-ubi-minimal
24.0.0.12-full-java17-openj9-ubi
24.0.0.12-full-java11-openj9-ubi
24.0.0.12-full-java8-openj9-ubi
24.0.0.12-full-java8-ibmjava-ubi
```

## 24.0.0.9
Expand All @@ -79,19 +95,3 @@ latest
24.0.0.9-full-java8-openj9-ubi
24.0.0.9-full-java8-ibmjava-ubi
```

## 24.0.0.6

```
24.0.0.6-kernel-java21-openj9-ubi-minimal
24.0.0.6-kernel-java17-openj9-ubi
24.0.0.6-kernel-java11-openj9-ubi
24.0.0.6-kernel-java8-ibmjava-ubi
24.0.0.6-kernel-java8-openj9-ubi

24.0.0.6-full-java21-openj9-ubi-minimal
24.0.0.6-full-java17-openj9-ubi
24.0.0.6-full-java11-openj9-ubi
24.0.0.6-full-java8-openj9-ubi
24.0.0.6-full-java8-ibmjava-ubi
```
Empty file modified ga/24.0.0.12/kernel/helpers/build/checkpoint.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/build/configure.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/build/features.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/build/infinispan-client-setup.sh
100644 → 100755
Empty file.
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/build/pidplus.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/build/populate_scc.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/runtime/docker-server.sh
100644 → 100755
Empty file.
Empty file modified ga/24.0.0.12/kernel/helpers/runtime/restore-server.sh
100644 → 100755
Empty file.
18 changes: 0 additions & 18 deletions ga/25.0.0.1/images.txt

This file was deleted.

6 changes: 6 additions & 0 deletions ga/25.0.0.2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# WebSphere Application Server Developer Edition Liberty image

Under this directory you can find build scripts for WebSphere Application Server Liberty container images:

* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel)
* [WebSphere Application Server Developer Edition Liberty, Full](full)
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:25.0.0.1-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-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:25.0.0.1-kernel-java8-ibmjava-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
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:25.0.0.1-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-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:25.0.0.1-kernel-java11-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
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:25.0.0.1-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-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:25.0.0.1-kernel-java17-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
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:25.0.0.1-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-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:25.0.0.1-kernel-java21-openj9-ubi9-minimal
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java21-openj9-ubi9-minimal
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
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:25.0.0.1-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-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:25.0.0.1-kernel-java8-openj9-ubi
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:25.0.0.2-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

Expand Down
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:25.0.0.1-kernel-java8-ibmjava
FROM websphere-liberty:25.0.0.2-kernel-java8-ibmjava

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
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:25.0.0.1-kernel-java11-openj9
FROM websphere-liberty:25.0.0.2-kernel-java11-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
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:25.0.0.1-kernel-java17-openj9
FROM websphere-liberty:25.0.0.2-kernel-java17-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""
Expand Down
File renamed without changes.
File renamed without changes.
18 changes: 18 additions & 0 deletions ga/25.0.0.2/images.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
websphere-liberty:25.0.0.2-kernel ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubuntu.ibmjava8
websphere-liberty:25.0.0.2-kernel-java11-openj9 ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk11
websphere-liberty:25.0.0.2-kernel-java17-openj9 ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubuntu.openjdk17
websphere-liberty:25.0.0.2-kernel-java8-ibmjava-ubi ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubi.ibmjava8
websphere-liberty:25.0.0.2-kernel-java8-openj9-ubi ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk8
websphere-liberty:25.0.0.2-kernel-java11-openj9-ubi ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk11
websphere-liberty:25.0.0.2-kernel-java17-openj9-ubi ../ga/25.0.0.2/kernel ../ga/25.0.0.2/kernel/Dockerfile.ubi.openjdk17
websphere-liberty:25.0.0.2-full ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubuntu.ibmjava8
websphere-liberty:25.0.0.2-full-java11-openj9 ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubuntu.openjdk11
websphere-liberty:25.0.0.2-full-java17-openj9 ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubuntu.openjdk17
websphere-liberty:25.0.0.2-full-java8-ibmjava-ubi ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubi.ibmjava8
websphere-liberty:25.0.0.2-full-java8-openj9-ubi ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubi.openjdk8
websphere-liberty:25.0.0.2-full-java11-openj9-ubi ../ga/25.0.0.2/full ../ga/25.0.0.2/full/Dockerfile.ubi.openjdk11
websphere-liberty:25.0.0.2-full-java17-openj9-ubi ../ga/25.0.0.2/full ../ga/25.0.0.2/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
Loading