Skip to content

Commit 36cbe4a

Browse files
jmtdjmtd
committed
[OPENJDK-3655] alternative fix for script permissions
Adjust the permissions of installed files such that files that should be executable have o+x. Remove unnecessary chowns and chmods that set g+w etc on files that should not be modified by running applications anyway. The results should be: $ podman run --rm -ti ubi9/openjdk-21:latest find /opt/jboss /usr/local/s2i -type f -printf "%M %u:%g %h/%f\n" -rw-r--r-- root:root /opt/jboss/container/openjdk/jdk/jvm-options -rw-r--r-- root:root /opt/jboss/container/s2i/core/s2i-core -rw-r--r-- root:root /opt/jboss/container/maven/default/maven.sh -rw-r--r-- root:root /opt/jboss/container/maven/default/jboss-settings.xml -rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-overrides -rw-r--r-- root:root /opt/jboss/container/maven/s2i/maven-s2i -rw-r--r-- root:root /opt/jboss/container/java/proxy/proxy-options -rw-r--r-- root:root /opt/jboss/container/java/proxy/parse-proxy-url.sh -rw-r--r-- root:root /opt/jboss/container/java/proxy/translate-no-proxy.sh -rwxr-xr-x root:root /opt/jboss/container/java/run/run-java.sh -rwxr-xr-x root:root /opt/jboss/container/java/jvm/debug-options -rwxr-xr-x root:root /opt/jboss/container/java/jvm/java-default-options -rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-overrides -rw-r--r-- root:root /opt/jboss/container/java/s2i/maven-s2i-overrides -rw-r--r-- root:root /opt/jboss/container/java/s2i/s2i-core-hooks -rw-r--r-- root:root /opt/jboss/container/util/logging/logging.sh -rwxr-xr-x root:root /usr/local/s2i/run -rwxr-xr-x root:root /usr/local/s2i/save-artifacts -rwxr-xr-x root:root /usr/local/s2i/assemble -rwxr-xr-x root:root /usr/local/s2i/usage Signed-off-by: Jonathan Dowland <[email protected]>
1 parent 2011eaa commit 36cbe4a

File tree

17 files changed

+43
-136
lines changed

17 files changed

+43
-136
lines changed

‎modules/jdk/17/configure.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ set -e
55
SCRIPT_DIR=$(dirname $0)
66
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
77

8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
8+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
159

1610
# Set this JDK as the alternative in use
1711
_arch="$(uname -i)"

‎modules/jdk/21/configure.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ set -e
55
SCRIPT_DIR=$(dirname $0)
66
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
77

8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
8+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
159

1610
# Set this JDK as the alternative in use
1711
_arch="$(uname -i)"

‎modules/jdk/8/configure.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,7 @@ set -e
55
SCRIPT_DIR=$(dirname $0)
66
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
77

8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
8+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jdk/jvm-options
159

1610
# Set this JDK as the alternative in use
1711
_arch="$(uname -i)"

‎modules/jre/17/configure.sh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
#!/bin/sh
2-
# Configure module
3-
set -e
1+
#!/bin/bash
2+
set -euo pipefail
43

54
SCRIPT_DIR=$(dirname $0)
6-
echo $SCRIPT_DIR
75
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
8-
echo $ARTIFACTS_DIR
96

10-
chown -R $USER:root $SCRIPT_DIR
11-
chmod -R ug+rwX $SCRIPT_DIR
12-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
13-
14-
pushd ${ARTIFACTS_DIR}
15-
cp -pr * /
16-
popd
7+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
178

189
# Set this JDK as the alternative in use
1910
_arch="$(uname -i)"

‎modules/jre/21/configure.sh‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
#!/bin/sh
2-
# Configure module
3-
set -e
1+
#!/bin/bash
2+
set -euo pipefail
43

54
SCRIPT_DIR=$(dirname $0)
6-
echo $SCRIPT_DIR
75
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
8-
echo $ARTIFACTS_DIR
96

10-
chown -R $USER:root $SCRIPT_DIR
11-
chmod -R ug+rwX $SCRIPT_DIR
12-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
13-
14-
pushd ${ARTIFACTS_DIR}
15-
cp -pr * /
16-
popd
7+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
178

189
# Set this JDK as the alternative in use
1910
_arch="$(uname -i)"

‎modules/jre/8/configure.sh‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
#!/bin/sh
2-
# Configure module
3-
set -e
1+
#!/bin/bash
2+
set -euo pipefail
43

54
SCRIPT_DIR=$(dirname $0)
65
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
76

8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
7+
install -m 0644 -D {${ARTIFACTS_DIR},}/opt/jboss/container/openjdk/jre/jvm-options
158

169
# Set this JDK as the alternative in use
1710
_arch="$(uname -i)"

‎modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options‎

100644100755
File mode changed.

‎modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options‎

100644100755
File mode changed.

‎modules/jvm/configure.sh‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
#!/bin/sh
2-
# Configure module
3-
set -e
1+
#!/bin/bash
2+
set -euo pipefail
43

54
SCRIPT_DIR=$(dirname $0)
65
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
76

8-
chown -R $USER:root $SCRIPT_DIR
9-
chmod -R ug+rwX $SCRIPT_DIR
10-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*
11-
12-
pushd ${ARTIFACTS_DIR}
13-
cp -pr * /
14-
popd
7+
install -D -t /opt/jboss/container/java/jvm \
8+
${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/*

‎modules/maven/default/configure.sh‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1-
#!/bin/sh
2-
# Configure module
3-
set -e
1+
#!/bin/bash
2+
set -euo pipefail
43

54
SCRIPT_DIR=$(dirname $0)
65
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
76

8-
# configure artifact permissions
9-
chown -R $USER:root $ARTIFACTS_DIR
10-
chmod -R ug+rwX $ARTIFACTS_DIR
11-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh
12-
13-
# install artifacts
14-
pushd ${ARTIFACTS_DIR}
15-
cp -pr * /
16-
popd
7+
install -m 0644 -D -t /opt/jboss/container/maven/default \
8+
${ARTIFACTS_DIR}/opt/jboss/container/maven/default/*
179

1810
MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
1911

2012
# pull in specific maven version to serve as default
2113
ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
22-
chown -h $USER:root /opt/jboss/container/maven/default/*
2314

2415
# install default settings.xml file in user home
2516
mkdir -p $HOME/.m2

0 commit comments

Comments
 (0)