Skip to content

Commit d5e7cd5

Browse files
kabicinkabicin
committed
Update file/folder permissions for OpenShift
1 parent 39a43e5 commit d5e7cd5

38 files changed

Lines changed: 95 additions & 135 deletions

‎releases/22.0.0.12/full/helpers/runtime/configure-liberty.sh‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,12 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3737
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3838
mkdir -p $SERVER_OUTPUT_DIR
3939
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
40-
chmod g+w $SERVER_OUTPUT_DIR
41-
40+
4241
# Copy old /output folder contents
4342
cp -r $ORIGINAL_SERVER_OUTPUT_DIR/. $SERVER_OUTPUT_DIR/ 2>/dev/null
44-
if [ ! -d "$SERVER_OUTPUT_DIR/resources" ]; then
45-
mkdir -p $SERVER_OUTPUT_DIR/resources
46-
fi
47-
if [ ! -d "$SERVER_OUTPUT_DIR/workarea" ]; then
48-
mkdir -p $SERVER_OUTPUT_DIR/workarea
49-
fi
50-
if [ ! -d "$SERVER_OUTPUT_DIR/logs" ]; then
51-
mkdir -p $SERVER_OUTPUT_DIR/logs
52-
fi
53-
54-
# Need to resolve group permissions for these folders
55-
chmod -R g+w $SERVER_OUTPUT_DIR/workarea
56-
chmod -R g+w,o-rwx $SERVER_OUTPUT_DIR/resources
57-
chmod -R g+w,o-rwx $SERVER_OUTPUT_DIR/logs
5843
rm -rf $ORIGINAL_SERVER_OUTPUT_DIR
44+
chmod -R g+rw $SERVER_OUTPUT_DIR
45+
setfacl -R -dm g:root:rw $SERVER_OUTPUT_DIR
5946

6047
# Add new server symlink and copy over old /config folder contents
6148
cp -r $OPT_PREFIX/wlp/usr/servers/$ORIGINAL_SERVER_NAME/. $OPT_PREFIX/wlp/usr/servers/$SERVER_NAME/ 2>/dev/null
@@ -66,7 +53,8 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
6653
mkdir -p /config/dropins
6754
mkdir -p /config/apps
6855
fi
69-
chmod -R g+w /config
56+
chmod -R g+rw /config
57+
setfacl -R -dm g:root:rw /config
7058
rm -rf $OPT_PREFIX/wlp/usr/servers/$ORIGINAL_SERVER_NAME
7159
fi
7260

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ RUN yum -y install wget unzip \
4141
&& yum -y remove wget unzip \
4242
&& yum clean all \
4343
&& chown -R 1001:0 /opt/ol/wlp \
44-
&& chmod -R g+rw /opt/ol/wlp
44+
&& chmod -R g+rw /opt/ol/wlp \
45+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4546

4647
# Set Path Shortcuts
4748
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ RUN yum -y install shadow-utils wget unzip openssl \
4141
&& yum -y remove shadow-utils wget unzip \
4242
&& yum clean all \
4343
&& chown -R 1001:0 /opt/ol/wlp \
44-
&& chmod -R g+rw /opt/ol/wlp
44+
&& chmod -R g+rw /opt/ol/wlp \
45+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4546

4647
# Set Path Shortcuts
4748
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ RUN yum -y install shadow-utils wget unzip openssl \
4141
&& yum -y remove shadow-utils wget unzip \
4242
&& yum clean all \
4343
&& chown -R 1001:0 /opt/ol/wlp \
44-
&& chmod -R g+rw /opt/ol/wlp
44+
&& chmod -R g+rw /opt/ol/wlp \
45+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4546

4647
# Set Path Shortcuts
4748
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ RUN yum -y install shadow-utils wget unzip openssl \
4141
&& yum -y remove shadow-utils wget unzip \
4242
&& yum clean all \
4343
&& chown -R 1001:0 /opt/ol/wlp \
44-
&& chmod -R g+rw /opt/ol/wlp
44+
&& chmod -R g+rw /opt/ol/wlp \
45+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4546

4647
# Set Path Shortcuts
4748
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ RUN apt-get update \
4040
&& rm -rf /var/lib/apt/lists/* \
4141
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
4242
&& chown -R 1001:0 /opt/ol/wlp \
43-
&& chmod -R g+rw /opt/ol/wlp
43+
&& chmod -R g+rw /opt/ol/wlp \
44+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4445

4546
# Set Path Shortcuts
4647
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ RUN apt-get update \
4040
&& rm -rf /var/lib/apt/lists/* \
4141
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
4242
&& chown -R 1001:0 /opt/ol/wlp \
43-
&& chmod -R g+rw /opt/ol/wlp
43+
&& chmod -R g+rw /opt/ol/wlp \
44+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4445

4546
# Set Path Shortcuts
4647
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

‎releases/22.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ RUN apt-get update \
4040
&& rm -rf /var/lib/apt/lists/* \
4141
&& useradd -u 1001 -r -g 0 -s /usr/sbin/nologin default \
4242
&& chown -R 1001:0 /opt/ol/wlp \
43-
&& chmod -R g+rw /opt/ol/wlp
44-
43+
&& chmod -R g+rw /opt/ol/wlp \
44+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
45+
4546
# Set Path Shortcuts
4647
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \
4748
LOG_DIR=/logs \

‎releases/22.0.0.12/kernel-slim/helpers/runtime/configure-liberty.sh‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,12 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
3737
ORIGINAL_SERVER_OUTPUT_DIR=$ORIGINAL_WLP_OUTPUT_DIR/$ORIGINAL_SERVER_NAME
3838
mkdir -p $SERVER_OUTPUT_DIR
3939
ln -s $SERVER_OUTPUT_DIR $OPT_PREFIX/links/output
40-
chmod g+w $SERVER_OUTPUT_DIR
41-
40+
4241
# Copy old /output folder contents
4342
cp -r $ORIGINAL_SERVER_OUTPUT_DIR/. $SERVER_OUTPUT_DIR/ 2>/dev/null
44-
if [ ! -d "$SERVER_OUTPUT_DIR/resources" ]; then
45-
mkdir -p $SERVER_OUTPUT_DIR/resources
46-
fi
47-
if [ ! -d "$SERVER_OUTPUT_DIR/workarea" ]; then
48-
mkdir -p $SERVER_OUTPUT_DIR/workarea
49-
fi
50-
if [ ! -d "$SERVER_OUTPUT_DIR/logs" ]; then
51-
mkdir -p $SERVER_OUTPUT_DIR/logs
52-
fi
53-
54-
# Need to resolve group permissions for these folders
55-
chmod -R g+w $SERVER_OUTPUT_DIR/workarea
56-
chmod -R g+w,o-rwx $SERVER_OUTPUT_DIR/resources
57-
chmod -R g+w,o-rwx $SERVER_OUTPUT_DIR/logs
5843
rm -rf $ORIGINAL_SERVER_OUTPUT_DIR
44+
chmod -R g+rw $SERVER_OUTPUT_DIR
45+
setfacl -R -dm g:root:rw $SERVER_OUTPUT_DIR
5946

6047
# Add new server symlink and copy over old /config folder contents
6148
cp -r $OPT_PREFIX/wlp/usr/servers/$ORIGINAL_SERVER_NAME/. $OPT_PREFIX/wlp/usr/servers/$SERVER_NAME/ 2>/dev/null
@@ -66,7 +53,8 @@ if [ "$SERVER_NAME" != "$ORIGINAL_SERVER_NAME" ] && [ -d "$OPT_PREFIX/wlp/usr/se
6653
mkdir -p /config/dropins
6754
mkdir -p /config/apps
6855
fi
69-
chmod -R g+w /config
56+
chmod -R g+rw /config
57+
setfacl -R -dm g:root:rw /config
7058
rm -rf $OPT_PREFIX/wlp/usr/servers/$ORIGINAL_SERVER_NAME
7159
fi
7260

‎releases/23.0.0.3/full/Dockerfile.ubi.ibmjava8‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ RUN yum -y install wget unzip \
3838
&& yum -y remove wget unzip \
3939
&& yum clean all \
4040
&& chown -R 1001:0 /opt/ol/wlp \
41-
&& chmod -R g+rw /opt/ol/wlp
41+
&& chmod -R g+rw /opt/ol/wlp \
42+
&& setfacl -R -dm g:root:rw /opt/ol/wlp
4243

4344
# Set Path Shortcuts
4445
ENV PATH=$PATH:/opt/ol/wlp/bin:/opt/ol/helpers/build \

0 commit comments

Comments
 (0)