Skip to content

Commit 841fc10

Browse files
leochrleochr
authored
Merge pull request #623 from WASdev/24.0.0.7-release
Updates for the release of 24.0.0.7
2 parents d94f503 + f59ccc7 commit 841fc10

File tree

75 files changed

+3220
-29
lines changed

Some content is hidden

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

75 files changed

+3220
-29
lines changed

‎ga/24.0.0.7/README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# WebSphere Application Server Developer Edition Liberty image
2+
3+
Under this directory you can find build scripts for WebSphere Application Server Liberty container images:
4+
5+
* [WebSphere Application Server Developer Edition Liberty, Kernel](kernel)
6+
* [WebSphere Application Server Developer Edition Liberty, Full](full)

‎ga/24.0.0.7/full/Dockerfile.ubi.ibmjava8‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java8-ibmjava-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java8-ibmjava-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubi.openjdk11‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java11-openj9-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java11-openj9-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubi.openjdk17‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java17-openj9-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java17-openj9-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubi.openjdk21‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java21-openj9-ubi9-minimal
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java21-openj9-ubi9-minimal
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubi.openjdk8‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java8-openj9-ubi
16+
FROM $PARENT_IMAGE AS installBundle
17+
18+
ARG VERBOSE=false
19+
ARG REPOSITORIES_PROPERTIES=""
20+
21+
# If there is a local copy of the repository use that instead
22+
COPY resources/ /tmp/
23+
24+
# Install the base bundle
25+
RUN set -eux; \
26+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
27+
mkdir /opt/ibm/wlp/etc/; \
28+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
29+
installUtility install --acceptLicense baseBundle; \
30+
rm /opt/ibm/wlp/etc/repositories.properties; \
31+
elif [ -f /tmp/wlpRepo.zip ]; then \
32+
installUtility install --acceptLicense baseBundle --from=/tmp/wlpRepo.zip; \
33+
else \
34+
installUtility install --acceptLicense baseBundle; \
35+
fi; \
36+
rm -rf /output/workarea /output/logs; \
37+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
38+
39+
ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.7-kernel-java8-openj9-ubi
40+
FROM $PARENT_IMAGE
41+
ARG VERBOSE=false
42+
43+
# Copy the runtime
44+
COPY --from=installBundle --chown=1001:0 /opt/ibm/wlp /opt/ibm/wlp
45+
46+
COPY --chown=1001:0 server.xml /config/
47+
48+
# Create a new SCC layer
49+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
50+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
51+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubuntu.ibmjava8‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM websphere-liberty:24.0.0.7-kernel-java8-ibmjava
16+
17+
ARG VERBOSE=false
18+
ARG REPOSITORIES_PROPERTIES=""
19+
20+
# Install the base bundle
21+
RUN set -eux; \
22+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
23+
mkdir /opt/ibm/wlp/etc/; \
24+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
25+
fi; \
26+
installUtility install --acceptLicense baseBundle; \
27+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
28+
rm /opt/ibm/wlp/etc/repositories.properties; \
29+
fi; \
30+
rm -rf /output/workarea /output/logs; \
31+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
32+
33+
COPY --chown=1001:0 server.xml /config/
34+
35+
# Create a new SCC layer
36+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
37+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
38+
&& find /opt/ibm/wlp/output ! -path "*.classCache*" ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubuntu.openjdk11‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM websphere-liberty:24.0.0.7-kernel-java11-openj9
16+
17+
ARG VERBOSE=false
18+
ARG REPOSITORIES_PROPERTIES=""
19+
20+
# Install the base bundle
21+
RUN set -eux; \
22+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
23+
mkdir /opt/ibm/wlp/etc/; \
24+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
25+
fi; \
26+
installUtility install --acceptLicense baseBundle; \
27+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
28+
rm /opt/ibm/wlp/etc/repositories.properties; \
29+
fi; \
30+
rm -rf /output/workarea /output/logs; \
31+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
32+
33+
COPY --chown=1001:0 server.xml /config/
34+
35+
# Create a new SCC layer
36+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
37+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
38+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/Dockerfile.ubuntu.openjdk17‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# (C) Copyright IBM Corporation 2023.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
FROM websphere-liberty:24.0.0.7-kernel-java17-openj9
16+
17+
ARG VERBOSE=false
18+
ARG REPOSITORIES_PROPERTIES=""
19+
20+
# Install the base bundle
21+
RUN set -eux; \
22+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
23+
mkdir /opt/ibm/wlp/etc/; \
24+
echo "$REPOSITORIES_PROPERTIES" > /opt/ibm/wlp/etc/repositories.properties; \
25+
fi; \
26+
installUtility install --acceptLicense baseBundle; \
27+
if [ ! -z "$REPOSITORIES_PROPERTIES" ]; then \
28+
rm /opt/ibm/wlp/etc/repositories.properties; \
29+
fi; \
30+
rm -rf /output/workarea /output/logs; \
31+
find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
32+
33+
COPY --chown=1001:0 server.xml /config/
34+
35+
# Create a new SCC layer
36+
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
37+
&& rm -rf /output/messaging /output/resources/security /logs/* $WLP_OUTPUT_DIR/.classCache \
38+
&& find /opt/ibm/wlp/output ! -perm -g=rwx -print0 | xargs -0 -r chmod g+rwx

‎ga/24.0.0.7/full/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# WebSphere Application Server Developer Edition Liberty image
2+
3+
The [Dockerfile.ubuntu.ibmjava8](Dockerfile.ubuntu.ibmjava8) in this directory is used to build the `websphere-liberty:full` image on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). The image contains IBM WebSphere Liberty with an extensive set of features for convenience.
4+
5+
# Usage
6+
7+
Instructions for using the image can be found on [Docker Hub](https://registry.hub.docker.com/_/websphere-liberty/). It is possible to build the image yourself by cloning this repository, changing to the `ga/<version>/full` directory and then issuing the command to build container image. For example, with Docker execute `docker build .`.

0 commit comments

Comments
 (0)