Skip to content

Commit d939654

Browse files
leochrkabicin
leochr
authored and
kabicin
committed
Update full and beta Dockerfiles
1 parent 7c68a85 commit d939654

24 files changed

+340
-110
lines changed

Diff for: ‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- [Open Liberty Images](#open-liberty-images)
44
- [Container Images](#container-images)
55
- [Building an Application Image](#building-an-application-image)
6-
- [Enterprise Functionality](#enterprise-functionality)
6+
- [Build Variables](#build-variables)
77
- [Security](#security)
88
- [OpenJ9 Shared Class Cache (SCC)](#openj9-shared-class-cache-scc)
99
- [Logging](#logging)
@@ -64,11 +64,11 @@ remoteRepo.user=operator
6464
remoteRepo.password={aes}KM8dhwcv892Ss1sawu9R+
6565
```
6666

67-
Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/command/featureUtility-modifications.html) for more information.
67+
Refer to [Repository and proxy modifications](https://openliberty.io/docs/ref/command/featureUtility-commands.html) for more information.
6868

69-
## Enterprise Functionality
69+
## Build Variables
7070

71-
This section describes the optional enterprise functionality that can be enabled via the Dockerfile during `build` time, by setting particular build-arguments (`ARG`) and calling `RUN configure.sh`. Each of these options trigger the inclusion of specific configuration via XML snippets (except for `VERBOSE`), described below:
71+
This section describes the optional build variables that can be enabled via the Dockerfile during the`build` time, by setting particular build-arguments (`ARG`) and calling `RUN configure.sh`. Each of these variables trigger the inclusion of specific configuration via XML snippets (except for `VERBOSE`), described below:
7272

7373
* `TLS` (`SSL` is deprecated)
7474
* Description: Enable Transport Security in Liberty by adding the `transportSecurity-1.0` feature (includes support for SSL).
@@ -79,9 +79,9 @@ This section describes the optional enterprise functionality that can be enabled
7979
* `VERBOSE`
8080
* Description: When set to `true` it outputs the commands and results to stdout from `configure.sh`. Otherwise, default setting is `false` and `configure.sh` is silenced.
8181

82-
### Deprecated Enterprise Functionality
82+
### Deprecated Build Variables
8383

84-
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.:
84+
The following container image build variables 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:
8585

8686
* `HTTP_ENDPOINT`
8787
* Description: Add configuration properties for an HTTP endpoint.

Diff for: ‎docs/icr-images.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ibmcloud cr images --restrict appcafe/open-liberty
3131

3232
## Latest version
3333

34-
The following tags include the most recent Open Liberty version: `25.0.0.1`
34+
The following tags include the most recent Open Liberty version: `25.0.0.2`
3535

3636
```
3737
kernel-slim-java21-openj9-ubi-minimal
@@ -57,20 +57,20 @@ The `beta` tag includes all the features and capabilities from the most recent r
5757
beta
5858
```
5959

60-
## 25.0.0.1
60+
## 25.0.0.2
6161

6262
```
63-
25.0.0.1-kernel-slim-java21-openj9-ubi-minimal
64-
25.0.0.1-kernel-slim-java17-openj9-ubi
65-
25.0.0.1-kernel-slim-java11-openj9-ubi
66-
25.0.0.1-kernel-slim-java8-openj9-ubi
67-
25.0.0.1-kernel-slim-java8-ibmjava-ubi
63+
25.0.0.2-kernel-slim-java21-openj9-ubi-minimal
64+
25.0.0.2-kernel-slim-java17-openj9-ubi
65+
25.0.0.2-kernel-slim-java11-openj9-ubi
66+
25.0.0.2-kernel-slim-java8-openj9-ubi
67+
25.0.0.2-kernel-slim-java8-ibmjava-ubi
6868
69-
25.0.0.1-full-java21-openj9-ubi-minimal
70-
25.0.0.1-full-java17-openj9-ubi
71-
25.0.0.1-full-java11-openj9-ubi
72-
25.0.0.1-full-java8-openj9-ubi
73-
25.0.0.1-full-java8-ibmjava-ubi
69+
25.0.0.2-full-java21-openj9-ubi-minimal
70+
25.0.0.2-full-java17-openj9-ubi
71+
25.0.0.2-full-java11-openj9-ubi
72+
25.0.0.2-full-java8-openj9-ubi
73+
25.0.0.2-full-java8-ibmjava-ubi
7474
```
7575

7676
## 24.0.0.12

Diff for: ‎releases/latest/beta/Dockerfile.ubi.openjdk21

+16-5
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
108108
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
109109

110110
# Create symlinks && set permissions for non-root user
111-
RUN mkdir /logs \
112-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
111+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
113112
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
114113
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
115114
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -122,8 +121,6 @@ RUN mkdir /logs \
122121
&& ln -s /opt/ol/fixes /fixes \
123122
&& chown -R 1001:0 /config \
124123
&& chmod -R g+rw /config \
125-
&& chown -R 1001:0 /logs \
126-
&& chmod -R g+rw /logs \
127124
&& chown -R 1001:0 /opt/ol/wlp/usr \
128125
&& chmod -R g+rw /opt/ol/wlp/usr \
129126
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -136,7 +133,21 @@ RUN mkdir /logs \
136133
&& chown -R 1001:0 /etc/wlp \
137134
&& chmod -R g+rw /etc/wlp \
138135
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
139-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
136+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
137+
&& mkdir -p /opt/ol/links \
138+
&& chown -R 1001:0 /opt/ol/links \
139+
&& chmod -R g+rw /opt/ol/links \
140+
&& mkdir -p /opt/ol/logs \
141+
&& chown -R 1001:0 /opt/ol/logs \
142+
&& chmod -R g+rw /opt/ol/logs \
143+
&& mkdir -p /serviceability \
144+
&& chown -R 1001:0 /serviceability \
145+
&& chmod -R g+rw /serviceability
146+
147+
USER 1001
148+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
149+
USER root
150+
RUN ln -s /opt/ol/links/logs /logs
140151

141152
# Create a new SCC layer
142153
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk11

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9089
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9190
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9291
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
112+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
113+
&& mkdir -p /opt/ol/links \
114+
&& chown -R 1001:0 /opt/ol/links \
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
122+
123+
USER 1001
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
125+
USER root
126+
RUN ln -s /opt/ol/links/logs /logs
116127

117128
# Create a new SCC layer
118129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk17

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9089
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9190
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9291
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
112+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
113+
&& mkdir -p /opt/ol/links \
114+
&& chown -R 1001:0 /opt/ol/links \
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
122+
123+
USER 1001
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
125+
USER root
126+
RUN ln -s /opt/ol/links/logs /logs
116127

117128
# Create a new SCC layer
118129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/beta/Dockerfile.ubuntu.openjdk8

+16-5
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
8585
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
8686

8787
# Create symlinks && set permissions for non-root user
88-
RUN mkdir /logs \
89-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
88+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
9089
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
9190
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
9291
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -99,8 +98,6 @@ RUN mkdir /logs \
9998
&& ln -s /opt/ol/fixes /fixes \
10099
&& chown -R 1001:0 /config \
101100
&& chmod -R g+rw /config \
102-
&& chown -R 1001:0 /logs \
103-
&& chmod -R g+rw /logs \
104101
&& chown -R 1001:0 /opt/ol/wlp/usr \
105102
&& chmod -R g+rw /opt/ol/wlp/usr \
106103
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -112,7 +109,21 @@ RUN mkdir /logs \
112109
&& mkdir /etc/wlp \
113110
&& chown -R 1001:0 /etc/wlp \
114111
&& chmod -R g+rw /etc/wlp \
115-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
112+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
113+
&& mkdir -p /opt/ol/links \
114+
&& chown -R 1001:0 /opt/ol/links \
115+
&& chmod -R g+rw /opt/ol/links \
116+
&& mkdir -p /opt/ol/logs \
117+
&& chown -R 1001:0 /opt/ol/logs \
118+
&& chmod -R g+rw /opt/ol/logs \
119+
&& mkdir -p /serviceability \
120+
&& chown -R 1001:0 /serviceability \
121+
&& chmod -R g+rw /serviceability
122+
123+
USER 1001
124+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
125+
USER root
126+
RUN ln -s /opt/ol/links/logs /logs
116127

117128
# Create a new SCC layer
118129
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/beta/helpers/runtime/docker-server.sh

+6
Original file line numberDiff line numberDiff line change
@@ -141,5 +141,11 @@ elif [[ ! -z "$WLP_CHECKPOINT" ]]; then
141141
checkpoint.sh "$TMP_CHECKPOINT"
142142
else
143143
# The default is to just exec the supplied CMD
144+
if [[ ! -z "$SERVICEABILITY_NAMESPACE" ]] && [[ ! -z $HOSTNAME ]]; then
145+
SERVICEABILITY_FOLDER="/serviceability/$SERVICEABILITY_NAMESPACE/$HOSTNAME"
146+
mkdir -p $SERVICEABILITY_FOLDER
147+
rm -f /opt/ol/links/logs
148+
ln -s $SERVICEABILITY_FOLDER /opt/ol/links/logs
149+
fi
144150
exec "$@"
145151
fi

Diff for: ‎releases/latest/full/Dockerfile.ubi.ibmjava8

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
122121
&& chown -R 1001:0 /config \
123122
&& chmod -R g+rw /config \
124-
&& chown -R 1001:0 /logs \
125-
&& chmod -R g+rw /logs \
126123
&& chown -R 1001:0 /opt/ol/wlp/usr \
127124
&& chmod -R g+rw /opt/ol/wlp/usr \
128125
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -134,7 +131,21 @@ RUN mkdir /logs \
134131
&& mkdir /etc/wlp \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
134+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
135+
&& mkdir -p /opt/ol/links \
136+
&& chown -R 1001:0 /opt/ol/links \
137+
&& chmod -R g+rw /opt/ol/links \
138+
&& mkdir -p /opt/ol/logs \
139+
&& chown -R 1001:0 /opt/ol/logs \
140+
&& chmod -R g+rw /opt/ol/logs \
141+
&& mkdir -p /serviceability \
142+
&& chown -R 1001:0 /serviceability \
143+
&& chmod -R g+rw /serviceability
144+
145+
USER 1001
146+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
147+
USER root
148+
RUN ln -s /opt/ol/links/logs /logs
138149

139150
# Create a new SCC layer
140151
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/full/Dockerfile.ubi.openjdk11

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
122121
&& chown -R 1001:0 /config \
123122
&& chmod -R g+rw /config \
124-
&& chown -R 1001:0 /logs \
125-
&& chmod -R g+rw /logs \
126123
&& chown -R 1001:0 /opt/ol/wlp/usr \
127124
&& chmod -R g+rw /opt/ol/wlp/usr \
128125
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -135,7 +132,21 @@ RUN mkdir /logs \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137134
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
138-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
135+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
136+
&& mkdir -p /opt/ol/links \
137+
&& chown -R 1001:0 /opt/ol/links \
138+
&& chmod -R g+rw /opt/ol/links \
139+
&& mkdir -p /opt/ol/logs \
140+
&& chown -R 1001:0 /opt/ol/logs \
141+
&& chmod -R g+rw /opt/ol/logs \
142+
&& mkdir -p /serviceability \
143+
&& chown -R 1001:0 /serviceability \
144+
&& chmod -R g+rw /serviceability
145+
146+
USER 1001
147+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
148+
USER root
149+
RUN ln -s /opt/ol/links/logs /logs
139150

140151
# Create a new SCC layer
141152
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

Diff for: ‎releases/latest/full/Dockerfile.ubi.openjdk17

+16-5
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ RUN /opt/ol/wlp/bin/server create --template=javaee8 \
107107
&& rm -rf /opt/ol/wlp/usr/servers/defaultServer/server.env
108108

109109
# Create symlinks && set permissions for non-root user
110-
RUN mkdir /logs \
111-
&& mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
110+
RUN mkdir -p /opt/ol/wlp/usr/shared/resources/lib.index.cache \
112111
&& ln -s /opt/ol/wlp/usr/shared/resources/lib.index.cache /lib.index.cache \
113112
&& mkdir -p $WLP_OUTPUT_DIR/defaultServer \
114113
&& ln -s $WLP_OUTPUT_DIR/defaultServer /output \
@@ -121,8 +120,6 @@ RUN mkdir /logs \
121120
&& ln -s /opt/ol/fixes /fixes \
122121
&& chown -R 1001:0 /config \
123122
&& chmod -R g+rw /config \
124-
&& chown -R 1001:0 /logs \
125-
&& chmod -R g+rw /logs \
126123
&& chown -R 1001:0 /opt/ol/wlp/usr \
127124
&& chmod -R g+rw /opt/ol/wlp/usr \
128125
&& chown -R 1001:0 /opt/ol/wlp/output \
@@ -135,7 +132,21 @@ RUN mkdir /logs \
135132
&& chown -R 1001:0 /etc/wlp \
136133
&& chmod -R g+rw /etc/wlp \
137134
&& if [ -e /etc/instanton.ld.so.cache ]; then chmod g+w /etc/ld.so.cache; fi \
138-
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml
135+
&& echo "<server description=\"Default Server\"><httpEndpoint id=\"defaultHttpEndpoint\" host=\"*\" /></server>" > /config/configDropins/defaults/open-default-port.xml \
136+
&& mkdir -p /opt/ol/links \
137+
&& chown -R 1001:0 /opt/ol/links \
138+
&& chmod -R g+rw /opt/ol/links \
139+
&& mkdir -p /opt/ol/logs \
140+
&& chown -R 1001:0 /opt/ol/logs \
141+
&& chmod -R g+rw /opt/ol/logs \
142+
&& mkdir -p /serviceability \
143+
&& chown -R 1001:0 /serviceability \
144+
&& chmod -R g+rw /serviceability
145+
146+
USER 1001
147+
RUN ln -s /opt/ol/logs /opt/ol/links/logs
148+
USER root
149+
RUN ln -s /opt/ol/links/logs /logs
139150

140151
# Create a new SCC layer
141152
RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \

0 commit comments

Comments
 (0)