Skip to content

Commit ef4ba6b

Browse files
wraschkewraschke
committed
Merge branch 'main' into vNext
2 parents 4ae1922 + a15c80d commit ef4ba6b

File tree

3 files changed

+58
-58
lines changed

3 files changed

+58
-58
lines changed

‎.github/workflows/update_files_for_release.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@ on:
66
workflow_dispatch:
77
inputs:
88
OLD_VERSION:
9-
description: 'Enter old version'
10-
# Show defaults as examples so user enters correct format.
11-
default: '23.0.0.11'
9+
description: 'Enter old version (what was just released)'
1210
required: true
1311
type: string
1412
NEW_VERSION:
15-
description: 'Enter new version'
16-
default: '23.0.0.12'
13+
description: 'Enter new version (pre-eGA release)'
1714
required: true
1815
type: string
1916
BETA_VERSION:
20-
description: 'Enter beta version'
21-
default: '24.0.0.1'
17+
description: 'Enter beta version (pre-eGA beta)'
2218
required: true
2319
type: string
2420
BUILD_LABEL:
@@ -60,7 +56,7 @@ jobs:
6056

6157
- name: Create Pull Request
6258
run: |
63-
gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r mbroz2 -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions"
59+
gh pr create -B vNext -H "${{ inputs.NEW_VERSION }}-release" -r leochr --title "Updates for the release of ${{ inputs.NEW_VERSION }}" --body "Created by Github Actions"
6460
env:
6561
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6662

‎README.md

+4-12
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,8 @@
1919
## Container Images
2020

2121
1. **Supported Images**
22-
* Our recommended set uses Red Hat's [Universal Base Image](https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image) as the Operating System and are re-built daily. They are available from [IBM Container Registry](docs/icr-images.md) and [Docker Hub](https://hub.docker.com/r/openliberty/open-liberty).
23-
* Another set, using Ubuntu as the Operating System, can be found on [Docker Hub](https://hub.docker.com/_/open-liberty). These are re-built automatically anytime something changes in the layers below.
24-
25-
1. **Beta Images**
26-
* The latest Open Liberty beta runtime can be found on [Docker Hub](https://hub.docker.com/_/open-liberty). It's available via the `beta` and `beta-java11` tags.
27-
28-
1. **Daily Images**
29-
* Images with the daily Open Liberty binaries are available [here](https://hub.docker.com/r/openliberty/daily). The scripts used for this image can be found [here](https://github.com/OpenLiberty/ci.docker.daily).
30-
31-
_**Important Notice:**_ The `kernel` **tag is now deprecated** and it will not be updated (starting with 20.0.0.11). The new tag, that provides kernel binary, is named `kernel-slim`.
22+
* Our recommended set uses Red Hat's [Universal Base Image (UBI)](https://www.redhat.com/en/blog/introducing-red-hat-universal-base-image) as the Operating System and are rebuilt periodically. They are available from IBM Container Registry (icr.io) and are listed [here](docs/icr-images.md).
23+
* Another set, using Ubuntu as the Operating System, can be found on [Docker Hub](https://hub.docker.com/_/open-liberty).
3224

3325
## Building an Application Image
3426

@@ -37,7 +29,7 @@ According to best practices for container images, you should create a new image
3729
Your application image template should follow a pattern similar to:
3830

3931
```dockerfile
40-
FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi
32+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
4133

4234
# Add Liberty server configuration including all necessary features
4335
COPY --chown=1001:0 server.xml /config/
@@ -91,7 +83,7 @@ This section describes the optional enterprise functionality that can be enabled
9183

9284
### Deprecated Enterprise Functionality
9385

94-
The following enterprise functionalities are now **deprecated**. You should **stop** using them. They are still available in `full` but not available in `kernel-slim`:
86+
The following enterprise functionalities are now **deprecated**. You should **stop** using them. They are still available in `full` but not available in `kernel-slim`. They have been removed from the Open Liberty images based on Java 21 and above.:
9587

9688
* `HTTP_ENDPOINT`
9789
* Description: Add configuration properties for an HTTP endpoint.

‎docs/icr-images.md

+50-38
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,24 @@
33

44
Open Liberty container images are available from the IBM Container Registry (ICR) at `icr.io/appcafe/open-liberty`. Our recommendation is to use ICR instead of Docker Hub since ICR doesn't impose rate limits on image pulls. Images can be pulled from ICR without authentication. Only images with Universal Base Image (UBI) as the Operating System are available in ICR.
55

6-
The images for the latest Liberty release and the last two quarterly releases (versions ending in _.3_, _.6_, _.9_ and _.12_) are available and are refreshed regularly to include fixes for the operating system (OS) and Java.
6+
The images for the latest Liberty release and the last two quarterly releases (versions ending in _.3_, _.6_, _.9_ and _.12_) are available and are refreshed regularly (every 1-2 weeks) to include fixes for the operating system (OS) and Java.
77

8-
Available image tags are listed below. The tags follow this naming convention:
8+
Available image tags are listed below. The tags use the following naming convention. For more information on tags, see [Container image tags naming conventions](https://docs-draft-openlibertyio.mqj6zf7jocq.us-south.codeengine.appdomain.cloud/docs/latest/container-images.html#tags) documentation.
99
```
10-
<fixpack_version_optional>-<liberty_image_flavour>-<java_version>-<java_type>-ubi
10+
<optional fix pack version-><liberty image type>-<java version>-<java type>-<base image type>
1111
```
1212

13+
Liberty images with Java 21 are based on UBI 9 minimal and include IBM Semeru Runtimes for Java 21 JRE. This combination offers a compact and effective Java runtime that is suited for applications that need Java 21.
14+
15+
Liberty images with Java 8, 11 and 17 and with the `openj9` type are based on UBI 8 standard and include IBM Semeru Runtime for the respective Java version with the JDK. Images with the `ibmjava` type are based on UBI 8 standard and include IBM Java 8 JRE.
16+
17+
The `latest` tag simplifies pulling the full latest Open Liberty release with the latest Java JRE. It is an alias for the `full-java21-openj9-ubi-minimal` tag. If you do not specify a tag value, `latest` is used by default.
18+
19+
The `beta` tag is based on UBI 9 minimal and the latest Java JRE and provides the most recent beta release of Liberty, which includes all the features and capabilities from the most recent release, plus new and updated features that are currently in development.
20+
1321
Append a tag to `icr.io/appcafe/open-liberty` to pull a specific image. For example:
1422
```
15-
icr.io/appcafe/open-liberty:23.0.0.9-kernel-slim-java17-openj9-ubi
23+
icr.io/appcafe/open-liberty:23.0.0.12-kernel-slim-java17-openj9-ubi
1624
```
1725

1826
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**:
@@ -21,61 +29,65 @@ ibmcloud cr region-set global
2129
ibmcloud cr images --restrict appcafe/open-liberty
2230
```
2331

24-
## Latest version (23.0.0.11)
32+
## Latest version (24.0.0.2)
2533

2634
```
35+
kernel-slim-java21-openj9-ubi-minimal
36+
kernel-slim-java17-openj9-ubi
37+
kernel-slim-java11-openj9-ubi
2738
kernel-slim-java8-openj9-ubi
2839
kernel-slim-java8-ibmjava-ubi
29-
kernel-slim-java11-openj9-ubi
30-
kernel-slim-java17-openj9-ubi
3140
41+
full-java21-openj9-ubi-minimal
42+
full-java17-openj9-ubi
43+
full-java11-openj9-ubi
3244
full-java8-openj9-ubi
3345
full-java8-ibmjava-ubi
34-
full-java11-openj9-ubi
35-
full-java17-openj9-ubi
3646
47+
latest
3748
beta
3849
```
3950

40-
## 23.0.0.11
51+
## 24.0.0.2
4152

4253
```
43-
23.0.0.11-kernel-slim-java8-openj9-ubi
44-
23.0.0.11-kernel-slim-java8-ibmjava-ubi
45-
23.0.0.11-kernel-slim-java11-openj9-ubi
46-
23.0.0.11-kernel-slim-java17-openj9-ubi
47-
48-
23.0.0.11-full-java8-openj9-ubi
49-
23.0.0.11-full-java8-ibmjava-ubi
50-
23.0.0.11-full-java11-openj9-ubi
51-
23.0.0.11-full-java17-openj9-ubi
54+
24.0.0.2-kernel-slim-java21-openj9-ubi-minimal
55+
24.0.0.2-kernel-slim-java17-openj9-ubi
56+
24.0.0.2-kernel-slim-java11-openj9-ubi
57+
24.0.0.2-kernel-slim-java8-openj9-ubi
58+
24.0.0.2-kernel-slim-java8-ibmjava-ubi
59+
60+
24.0.0.2-full-java21-openj9-ubi-minimal
61+
24.0.0.2-full-java17-openj9-ubi
62+
24.0.0.2-full-java11-openj9-ubi
63+
24.0.0.2-full-java8-openj9-ubi
64+
24.0.0.2-full-java8-ibmjava-ubi
65+
```
66+
67+
## 23.0.0.12
68+
69+
```
70+
23.0.0.12-kernel-slim-java17-openj9-ubi
71+
23.0.0.12-kernel-slim-java11-openj9-ubi
72+
23.0.0.12-kernel-slim-java8-openj9-ubi
73+
23.0.0.12-kernel-slim-java8-ibmjava-ubi
74+
75+
23.0.0.12-full-java17-openj9-ubi
76+
23.0.0.12-full-java11-openj9-ubi
77+
23.0.0.12-full-java8-openj9-ubi
78+
23.0.0.12-full-java8-ibmjava-ubi
5279
```
5380

5481
## 23.0.0.9
5582

5683
```
84+
23.0.0.9-kernel-slim-java17-openj9-ubi
85+
23.0.0.9-kernel-slim-java11-openj9-ubi
5786
23.0.0.9-kernel-slim-java8-openj9-ubi
5887
23.0.0.9-kernel-slim-java8-ibmjava-ubi
59-
23.0.0.9-kernel-slim-java11-openj9-ubi
60-
23.0.0.9-kernel-slim-java17-openj9-ubi
6188
89+
23.0.0.9-full-java17-openj9-ubi
90+
23.0.0.9-full-java11-openj9-ubi
6291
23.0.0.9-full-java8-openj9-ubi
6392
23.0.0.9-full-java8-ibmjava-ubi
64-
23.0.0.9-full-java11-openj9-ubi
65-
23.0.0.9-full-java17-openj9-ubi
6693
```
67-
68-
## 23.0.0.6
69-
70-
```
71-
23.0.0.6-kernel-slim-java8-openj9-ubi
72-
23.0.0.6-kernel-slim-java8-ibmjava-ubi
73-
23.0.0.6-kernel-slim-java11-openj9-ubi
74-
23.0.0.6-kernel-slim-java17-openj9-ubi
75-
76-
23.0.0.6-full-java8-openj9-ubi
77-
23.0.0.6-full-java8-ibmjava-ubi
78-
23.0.0.6-full-java11-openj9-ubi
79-
23.0.0.6-full-java17-openj9-ubi
80-
```
81-

0 commit comments

Comments
 (0)