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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ before_install:
env:
- RELEASE=../ga/23.0.0.6
- RELEASE=../ga/23.0.0.9

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

23.0.0.9 shouldn't be removed as it's still maintained

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file isn't used anymore but I will update it.

- RELEASE=../ga/23.0.0.10
- RELEASE=../ga/latest

script:
Expand Down
56 changes: 21 additions & 35 deletions docs/icr-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Available image tags are listed below. The tags follow this naming convention:

Append a tag to `icr.io/appcafe/websphere-liberty` to pull a specific image. For example,
```
icr.io/appcafe/websphere-liberty:23.0.0.3-kernel-java17-openj9-ubi
icr.io/appcafe/websphere-liberty:23.0.0.9-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 @@ -36,44 +36,30 @@ full-java11-openj9-ubi
full-java17-openj9-ubi
```

## 23.0.0.4
## 23.0.0.9

```
23.0.0.4-kernel-java8-openj9-ubi
23.0.0.4-kernel-java8-ibmjava-ubi
23.0.0.4-kernel-java11-openj9-ubi
23.0.0.4-kernel-java17-openj9-ubi

23.0.0.4-full-java8-openj9-ubi
23.0.0.4-full-java8-ibmjava-ubi
23.0.0.4-full-java11-openj9-ubi
23.0.0.4-full-java17-openj9-ubi
23.0.0.9-kernel-java8-openj9-ubi
23.0.0.9-kernel-java8-ibmjava-ubi
23.0.0.9-kernel-java11-openj9-ubi
23.0.0.9-kernel-java17-openj9-ubi

23.0.0.9-full-java8-openj9-ubi
23.0.0.9-full-java8-ibmjava-ubi
23.0.0.9-full-java11-openj9-ubi
23.0.0.9-full-java17-openj9-ubi
```

## 23.0.0.3
## 23.0.0.6

```
23.0.0.3-kernel-java8-openj9-ubi
23.0.0.3-kernel-java8-ibmjava-ubi
23.0.0.3-kernel-java11-openj9-ubi
23.0.0.3-kernel-java17-openj9-ubi

23.0.0.3-full-java8-openj9-ubi
23.0.0.3-full-java8-ibmjava-ubi
23.0.0.3-full-java11-openj9-ubi
23.0.0.3-full-java17-openj9-ubi
```

## 22.0.0.12

```
22.0.0.12-kernel-java8-openj9-ubi
22.0.0.12-kernel-java8-ibmjava-ubi
22.0.0.12-kernel-java11-openj9-ubi
22.0.0.12-kernel-java17-openj9-ubi

22.0.0.12-full-java8-openj9-ubi
22.0.0.12-full-java8-ibmjava-ubi
22.0.0.12-full-java11-openj9-ubi
22.0.0.12-full-java17-openj9-ubi
23.0.0.6-kernel-java8-openj9-ubi
23.0.0.6-kernel-java8-ibmjava-ubi
23.0.0.6-kernel-java11-openj9-ubi
23.0.0.6-kernel-java17-openj9-ubi

23.0.0.6-full-java8-openj9-ubi
23.0.0.6-full-java8-ibmjava-ubi
23.0.0.6-full-java11-openj9-ubi
23.0.0.6-full-java17-openj9-ubi
```
6 changes: 6 additions & 0 deletions ga/23.0.0.10/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)
51 changes: 51 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubi.ibmjava8
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

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

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
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:23.0.0.10-kernel-java8-ibmjava-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
51 changes: 51 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubi.openjdk11
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

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

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
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:23.0.0.10-kernel-java11-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
51 changes: 51 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubi.openjdk17
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

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

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
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:23.0.0.10-kernel-java17-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
51 changes: 51 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubi.openjdk8
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

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

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# If there is a local copy of the repository use that instead
COPY resources/ /tmp/

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
installUtility install --acceptLicense baseBundle; \
rm /opt/ibm/wlp/etc/repositories.properties; \
elif [ -f /tmp/wlpRepo.zip ]; then \
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
else \
installUtility install --acceptLicense baseBundle; \
fi; \
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:23.0.0.10-kernel-java8-openj9-ubi
FROM $PARENT_IMAGE
ARG VERBOSE=false

# Copy the runtime
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
38 changes: 38 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubuntu.ibmjava8
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:23.0.0.10-kernel-java8-ibmjava

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
38 changes: 38 additions & 0 deletions ga/23.0.0.10/full/Dockerfile.ubuntu.openjdk11
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# (C) Copyright IBM Corporation 2023.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

FROM websphere-liberty:23.0.0.10-kernel-java11-openj9

ARG VERBOSE=false
ARG REPOSITORIES_PROPERTIES=""

# Install the base bundle
RUN set -eux; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
mkdir /opt/ibm/wlp/etc/; \
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
fi; \
installUtility install --acceptLicense baseBundle; \
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
rm /opt/ibm/wlp/etc/repositories.properties; \
fi; \
rm -rf /output/workarea /output/logs; \
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;

COPY --chown=1001:0 server.xml /config/

# Create a new SCC layer
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx
Loading