From 18ee5a64059f7ea1040834c38fec996e74cd9bba Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 11 Apr 2025 14:37:58 +0100 Subject: [PATCH 1/2] [OPENJDK-3655] test for files with u+x and not o+x Signed-off-by: Jonathan Dowland --- tests/features/imagebasic.feature | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/features/imagebasic.feature b/tests/features/imagebasic.feature index ceb6be8d..cccff61e 100644 --- a/tests/features/imagebasic.feature +++ b/tests/features/imagebasic.feature @@ -15,3 +15,10 @@ Feature: Tests for all openshift images Scenario: Check that builder labels are correctly set Given image is built Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i + + @ubi9 + Scenario: Check installed scripts are executable by all users (OPENJDK-3655) + When container is started with args + | arg | value | + | command | find /opt/jboss/container -type f -perm -g+x ( ! -perm -o+x ) -ls | + Then available container log should not contain /opt/jboss/container From 20a5342867cdcbe7fa5990ad8988e9d83be13bdc Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 11 Apr 2025 14:40:20 +0100 Subject: [PATCH 2/2] [OPENJDK-3655] change script permissions to permit o+x We currently move scripts into place by executing a configure.sh script, and changing ownership and permissions etc. However, in the majority of cases we could instead declare where scripts should be installed using artifacts:. The advantages are: smaller sources; more declarative; more uniform ownership (default root:root); no need to chown (set the permissions on the script in git directly). Also addresses OPENJDK-2814 (running user shouldn't own /opt/jboss/container) Signed-off-by: Jonathan Dowland --- .../jboss/container/openjdk/jdk => }/jvm-options | 0 modules/jdk/17/configure.sh | 11 ----------- modules/jdk/17/module.yaml | 4 ++++ .../jboss/container/openjdk/jdk => }/jvm-options | 0 modules/jdk/21/configure.sh | 11 ----------- modules/jdk/21/module.yaml | 4 ++++ .../jboss/container/openjdk/jre => }/jvm-options | 0 modules/jre/17/configure.sh | 14 -------------- modules/jre/17/module.yaml | 4 ++++ .../jboss/container/openjdk/jre => }/jvm-options | 0 modules/jre/21/configure.sh | 14 -------------- modules/jre/21/module.yaml | 4 ++++ .../jboss/container/java => }/jvm/debug-options | 0 .../container/java => }/jvm/java-default-options | 0 modules/jvm/configure.sh | 14 -------------- modules/jvm/module.yaml | 5 +++-- .../maven => }/default/jboss-settings.xml | 0 .../jboss/container/maven => }/default/maven.sh | 0 modules/maven/default/configure.sh | 13 ------------- modules/maven/default/module.yaml | 4 ++++ modules/maven/module/configure.sh | 7 ------- modules/maven/module/module.yaml | 5 +++-- .../container/maven => }/s2i/maven-overrides | 0 .../jboss/container/maven => }/s2i/maven-s2i | 0 .../artifacts/{usr/local/s2i => }/save-artifacts | 0 .../maven/s2i/artifacts/usr/local/s2i/assemble | 9 --------- modules/maven/s2i/configure.sh | 15 --------------- modules/maven/s2i/module.yaml | 9 ++++++--- .../container/java => }/proxy/parse-proxy-url.sh | 0 .../container/java => }/proxy/proxy-options | 0 .../java => }/proxy/translate-no-proxy.sh | 0 modules/proxy/configure.sh | 14 -------------- modules/proxy/module.yaml | 5 +++-- .../jboss/container/java/run => }/run-java.sh | 0 modules/run/configure.sh | 12 ------------ modules/run/module.yaml | 4 ++++ .../artifacts/{usr/local/s2i => local}/assemble | 0 .../bash/artifacts/{usr/local/s2i => local}/run | 0 .../artifacts/{usr/local/s2i => local}/usage | 0 .../container/java/s2i => }/maven-overrides | 0 .../container/java/s2i => }/maven-s2i-overrides | 0 .../container/java/s2i => }/s2i-core-hooks | 0 modules/s2i/bash/configure.sh | 15 --------------- modules/s2i/bash/module.yaml | 9 ++++++--- .../{opt/jboss/container/s2i/core => }/s2i-core | 0 modules/s2i/core/configure.sh | 16 ---------------- modules/s2i/core/module.yaml | 4 ++++ .../jboss/container/util/logging => }/logging.sh | 0 modules/util/logging/configure.sh | 14 -------------- modules/util/logging/module.yaml | 5 +++-- 50 files changed, 52 insertions(+), 193 deletions(-) rename modules/jdk/17/artifacts/{opt/jboss/container/openjdk/jdk => }/jvm-options (100%) rename modules/jdk/21/artifacts/{opt/jboss/container/openjdk/jdk => }/jvm-options (100%) rename modules/jre/17/artifacts/{opt/jboss/container/openjdk/jre => }/jvm-options (100%) rename modules/jre/21/artifacts/{opt/jboss/container/openjdk/jre => }/jvm-options (100%) rename modules/jvm/artifacts/{opt/jboss/container/java => }/jvm/debug-options (100%) mode change 100644 => 100755 rename modules/jvm/artifacts/{opt/jboss/container/java => }/jvm/java-default-options (100%) mode change 100644 => 100755 delete mode 100755 modules/jvm/configure.sh rename modules/maven/default/artifacts/{opt/jboss/container/maven => }/default/jboss-settings.xml (100%) rename modules/maven/default/artifacts/{opt/jboss/container/maven => }/default/maven.sh (100%) delete mode 100755 modules/maven/module/configure.sh rename modules/maven/s2i/artifacts/{opt/jboss/container/maven => }/s2i/maven-overrides (100%) rename modules/maven/s2i/artifacts/{opt/jboss/container/maven => }/s2i/maven-s2i (100%) rename modules/maven/s2i/artifacts/{usr/local/s2i => }/save-artifacts (100%) mode change 100644 => 100755 delete mode 100644 modules/maven/s2i/artifacts/usr/local/s2i/assemble delete mode 100755 modules/maven/s2i/configure.sh rename modules/proxy/artifacts/{opt/jboss/container/java => }/proxy/parse-proxy-url.sh (100%) rename modules/proxy/artifacts/{opt/jboss/container/java => }/proxy/proxy-options (100%) rename modules/proxy/artifacts/{opt/jboss/container/java => }/proxy/translate-no-proxy.sh (100%) delete mode 100755 modules/proxy/configure.sh rename modules/run/artifacts/{opt/jboss/container/java/run => }/run-java.sh (100%) mode change 100644 => 100755 rename modules/s2i/bash/artifacts/{usr/local/s2i => local}/assemble (100%) mode change 100644 => 100755 rename modules/s2i/bash/artifacts/{usr/local/s2i => local}/run (100%) mode change 100644 => 100755 rename modules/s2i/bash/artifacts/{usr/local/s2i => local}/usage (100%) mode change 100644 => 100755 rename modules/s2i/bash/artifacts/opt/{jboss/container/java/s2i => }/maven-overrides (100%) rename modules/s2i/bash/artifacts/opt/{jboss/container/java/s2i => }/maven-s2i-overrides (100%) rename modules/s2i/bash/artifacts/opt/{jboss/container/java/s2i => }/s2i-core-hooks (100%) delete mode 100755 modules/s2i/bash/configure.sh rename modules/s2i/core/artifacts/{opt/jboss/container/s2i/core => }/s2i-core (100%) rename modules/util/logging/artifacts/{opt/jboss/container/util/logging => }/logging.sh (100%) delete mode 100755 modules/util/logging/configure.sh diff --git a/modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/jdk/17/artifacts/jvm-options similarity index 100% rename from modules/jdk/17/artifacts/opt/jboss/container/openjdk/jdk/jvm-options rename to modules/jdk/17/artifacts/jvm-options diff --git a/modules/jdk/17/configure.sh b/modules/jdk/17/configure.sh index 45c61950..d19bea43 100755 --- a/modules/jdk/17/configure.sh +++ b/modules/jdk/17/configure.sh @@ -2,17 +2,6 @@ # Configure module set -e -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - # Set this JDK as the alternative in use _arch="$(uname -i)" alternatives --set java java-17-openjdk.${_arch} diff --git a/modules/jdk/17/module.yaml b/modules/jdk/17/module.yaml index 3fd1cd48..32dc1bf1 100644 --- a/modules/jdk/17/module.yaml +++ b/modules/jdk/17/module.yaml @@ -33,3 +33,7 @@ modules: execute: - script: configure.sh + +artifacts: + - path: artifacts/jvm-options + dest: /opt/jboss/container/openjdk/jdk diff --git a/modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options b/modules/jdk/21/artifacts/jvm-options similarity index 100% rename from modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options rename to modules/jdk/21/artifacts/jvm-options diff --git a/modules/jdk/21/configure.sh b/modules/jdk/21/configure.sh index d9bc0423..2020168a 100755 --- a/modules/jdk/21/configure.sh +++ b/modules/jdk/21/configure.sh @@ -2,17 +2,6 @@ # Configure module set -e -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jdk/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - # Set this JDK as the alternative in use _arch="$(uname -i)" alternatives --set java java-21-openjdk.${_arch} diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml index fe2f4a5f..85834284 100644 --- a/modules/jdk/21/module.yaml +++ b/modules/jdk/21/module.yaml @@ -33,3 +33,7 @@ modules: execute: - script: configure.sh + +artifacts: + - path: artifacts/jvm-options + dest: /opt/jboss/container/openjdk/jdk diff --git a/modules/jre/17/artifacts/opt/jboss/container/openjdk/jre/jvm-options b/modules/jre/17/artifacts/jvm-options similarity index 100% rename from modules/jre/17/artifacts/opt/jboss/container/openjdk/jre/jvm-options rename to modules/jre/17/artifacts/jvm-options diff --git a/modules/jre/17/configure.sh b/modules/jre/17/configure.sh index aef9b58b..815ee27d 100755 --- a/modules/jre/17/configure.sh +++ b/modules/jre/17/configure.sh @@ -1,20 +1,6 @@ #!/bin/sh -# Configure module set -e -SCRIPT_DIR=$(dirname $0) -echo $SCRIPT_DIR -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts -echo $ARTIFACTS_DIR - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - # Set this JDK as the alternative in use _arch="$(uname -i)" alternatives --set java java-17-openjdk.${_arch} diff --git a/modules/jre/17/module.yaml b/modules/jre/17/module.yaml index 88e87617..2ad5b0a3 100644 --- a/modules/jre/17/module.yaml +++ b/modules/jre/17/module.yaml @@ -33,3 +33,7 @@ modules: execute: - script: configure.sh + +artifacts: + - path: artifacts/jvm-options + dest: /opt/jboss/container/openjdk/jre diff --git a/modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options b/modules/jre/21/artifacts/jvm-options similarity index 100% rename from modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options rename to modules/jre/21/artifacts/jvm-options diff --git a/modules/jre/21/configure.sh b/modules/jre/21/configure.sh index 4e4af97a..038a8e71 100755 --- a/modules/jre/21/configure.sh +++ b/modules/jre/21/configure.sh @@ -1,20 +1,6 @@ #!/bin/sh -# Configure module set -e -SCRIPT_DIR=$(dirname $0) -echo $SCRIPT_DIR -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts -echo $ARTIFACTS_DIR - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/openjdk/jre/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - # Set this JDK as the alternative in use _arch="$(uname -i)" alternatives --set java java-21-openjdk.${_arch} diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml index 5a2ff731..aba6937f 100644 --- a/modules/jre/21/module.yaml +++ b/modules/jre/21/module.yaml @@ -33,3 +33,7 @@ modules: execute: - script: configure.sh + +artifacts: + - path: artifacts/jvm-options + dest: /opt/jboss/container/openjdk/jre diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options b/modules/jvm/artifacts/jvm/debug-options old mode 100644 new mode 100755 similarity index 100% rename from modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options rename to modules/jvm/artifacts/jvm/debug-options diff --git a/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options b/modules/jvm/artifacts/jvm/java-default-options old mode 100644 new mode 100755 similarity index 100% rename from modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options rename to modules/jvm/artifacts/jvm/java-default-options diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh deleted file mode 100755 index 79e86ecc..00000000 --- a/modules/jvm/configure.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jvm/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd diff --git a/modules/jvm/module.yaml b/modules/jvm/module.yaml index c7f381b5..8a454e6c 100644 --- a/modules/jvm/module.yaml +++ b/modules/jvm/module.yaml @@ -5,8 +5,9 @@ description: ^ Provides support for configuring Java JVM, e.g. GC settings, etc. Basic usage is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options) -execute: -- script: configure.sh +artifacts: + - path: artifacts/jvm + dest: /opt/jboss/container/java/jvm modules: install: diff --git a/modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml b/modules/maven/default/artifacts/default/jboss-settings.xml similarity index 100% rename from modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml rename to modules/maven/default/artifacts/default/jboss-settings.xml diff --git a/modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh b/modules/maven/default/artifacts/default/maven.sh similarity index 100% rename from modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh rename to modules/maven/default/artifacts/default/maven.sh diff --git a/modules/maven/default/configure.sh b/modules/maven/default/configure.sh index 7542b69d..8339e2ff 100755 --- a/modules/maven/default/configure.sh +++ b/modules/maven/default/configure.sh @@ -2,19 +2,6 @@ # Configure module set -e -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -# configure artifact permissions -chown -R $USER:root $ARTIFACTS_DIR -chmod -R ug+rwX $ARTIFACTS_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh - -# install artifacts -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./} # pull in specific maven version to serve as default diff --git a/modules/maven/default/module.yaml b/modules/maven/default/module.yaml index e029a78e..08ae2a84 100644 --- a/modules/maven/default/module.yaml +++ b/modules/maven/default/module.yaml @@ -8,6 +8,10 @@ description: ^ execute: - script: configure.sh +artifacts: + - path: artifacts/default + dest: /opt/jboss/container/maven/default + modules: install: - name: jboss.container.user diff --git a/modules/maven/module/configure.sh b/modules/maven/module/configure.sh deleted file mode 100755 index d42c27a7..00000000 --- a/modules/maven/module/configure.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -cp ${ARTIFACTS_DIR}/maven.module /etc/dnf/modules.d/maven.module diff --git a/modules/maven/module/module.yaml b/modules/maven/module/module.yaml index cd2b136d..4128f34f 100644 --- a/modules/maven/module/module.yaml +++ b/modules/maven/module/module.yaml @@ -4,5 +4,6 @@ version: '3.8' description: ^ Enables the AppStream RPM Module for Maven 3.8 packages. -execute: -- script: configure.sh +artifacts: + - path: artifacts/maven.module + dest: /etc/dnf/modules.d diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides b/modules/maven/s2i/artifacts/s2i/maven-overrides similarity index 100% rename from modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides rename to modules/maven/s2i/artifacts/s2i/maven-overrides diff --git a/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i b/modules/maven/s2i/artifacts/s2i/maven-s2i similarity index 100% rename from modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i rename to modules/maven/s2i/artifacts/s2i/maven-s2i diff --git a/modules/maven/s2i/artifacts/usr/local/s2i/save-artifacts b/modules/maven/s2i/artifacts/save-artifacts old mode 100644 new mode 100755 similarity index 100% rename from modules/maven/s2i/artifacts/usr/local/s2i/save-artifacts rename to modules/maven/s2i/artifacts/save-artifacts diff --git a/modules/maven/s2i/artifacts/usr/local/s2i/assemble b/modules/maven/s2i/artifacts/usr/local/s2i/assemble deleted file mode 100644 index e926d46c..00000000 --- a/modules/maven/s2i/artifacts/usr/local/s2i/assemble +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh" -source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i" - -# invoke the build -maven_s2i_build diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh deleted file mode 100755 index 3be021b0..00000000 --- a/modules/maven/s2i/configure.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/s2i/* -chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd diff --git a/modules/maven/s2i/module.yaml b/modules/maven/s2i/module.yaml index 11c53490..da17a28e 100644 --- a/modules/maven/s2i/module.yaml +++ b/modules/maven/s2i/module.yaml @@ -23,9 +23,6 @@ envs: - name: JBOSS_CONTAINER_MAVEN_S2I_MODULE value: /opt/jboss/container/maven/s2i -execute: -- script: configure.sh - modules: install: - name: jboss.container.user @@ -36,3 +33,9 @@ modules: packages: install: - tar + +artifacts: + - path: artifacts/s2i + dest: /opt/jboss/container/maven/s2i + - path: artifacts/save-artifacts + dest: /usr/libexec/s2i diff --git a/modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh b/modules/proxy/artifacts/proxy/parse-proxy-url.sh similarity index 100% rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh rename to modules/proxy/artifacts/proxy/parse-proxy-url.sh diff --git a/modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options b/modules/proxy/artifacts/proxy/proxy-options similarity index 100% rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options rename to modules/proxy/artifacts/proxy/proxy-options diff --git a/modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh b/modules/proxy/artifacts/proxy/translate-no-proxy.sh similarity index 100% rename from modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh rename to modules/proxy/artifacts/proxy/translate-no-proxy.sh diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh deleted file mode 100755 index 4f485eb5..00000000 --- a/modules/proxy/configure.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/proxy* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd diff --git a/modules/proxy/module.yaml b/modules/proxy/module.yaml index ba613442..3a50686f 100644 --- a/modules/proxy/module.yaml +++ b/modules/proxy/module.yaml @@ -23,5 +23,6 @@ modules: install: - name: jboss.container.user -execute: -- script: configure.sh +artifacts: + - path: artifacts/proxy + dest: /opt/jboss/container/java/proxy diff --git a/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh b/modules/run/artifacts/run-java.sh old mode 100644 new mode 100755 similarity index 100% rename from modules/run/artifacts/opt/jboss/container/java/run/run-java.sh rename to modules/run/artifacts/run-java.sh diff --git a/modules/run/configure.sh b/modules/run/configure.sh index 218e0d0e..f7033608 100755 --- a/modules/run/configure.sh +++ b/modules/run/configure.sh @@ -1,18 +1,6 @@ #!/bin/sh -# Configure module set -e -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/run/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - mkdir -p /deployments/data \ && chmod -R "ug+rwX" /deployments/data \ && chown -R $USER:root /deployments/data diff --git a/modules/run/module.yaml b/modules/run/module.yaml index 249e85eb..70be354d 100644 --- a/modules/run/module.yaml +++ b/modules/run/module.yaml @@ -59,3 +59,7 @@ modules: - name: jboss.container.user - name: jboss.container.java.jvm - name: jboss.container.util.logging + +artifacts: + - path: artifacts/run-java.sh + dest: /opt/jboss/container/java/run diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/local/assemble old mode 100644 new mode 100755 similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/assemble rename to modules/s2i/bash/artifacts/local/assemble diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/run b/modules/s2i/bash/artifacts/local/run old mode 100644 new mode 100755 similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/run rename to modules/s2i/bash/artifacts/local/run diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/usage b/modules/s2i/bash/artifacts/local/usage old mode 100644 new mode 100755 similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/usage rename to modules/s2i/bash/artifacts/local/usage diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides b/modules/s2i/bash/artifacts/opt/maven-overrides similarity index 100% rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides rename to modules/s2i/bash/artifacts/opt/maven-overrides diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides b/modules/s2i/bash/artifacts/opt/maven-s2i-overrides similarity index 100% rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides rename to modules/s2i/bash/artifacts/opt/maven-s2i-overrides diff --git a/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks b/modules/s2i/bash/artifacts/opt/s2i-core-hooks similarity index 100% rename from modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks rename to modules/s2i/bash/artifacts/opt/s2i-core-hooks diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh deleted file mode 100755 index a56b65c9..00000000 --- a/modules/s2i/bash/configure.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/* -chmod ug+x ${ARTIFACTS_DIR}/usr/local/s2i/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd diff --git a/modules/s2i/bash/module.yaml b/modules/s2i/bash/module.yaml index 3199994c..89dd8bf9 100644 --- a/modules/s2i/bash/module.yaml +++ b/modules/s2i/bash/module.yaml @@ -7,9 +7,6 @@ envs: - name: JBOSS_CONTAINER_JAVA_S2I_MODULE value: /opt/jboss/container/java/s2i -execute: -- script: configure.sh - modules: install: - name: jboss.container.user @@ -20,3 +17,9 @@ modules: packages: install: - rsync + +artifacts: + - path: artifacts/local + dest: /usr/local/s2i + - path: artifacts/opt + dest: /opt/jboss/container/java/s2i diff --git a/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core b/modules/s2i/core/artifacts/s2i-core similarity index 100% rename from modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core rename to modules/s2i/core/artifacts/s2i-core diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh index 032068e6..1be1f78a 100755 --- a/modules/s2i/core/configure.sh +++ b/modules/s2i/core/configure.sh @@ -1,22 +1,6 @@ #!/bin/sh -# Configure module set -e -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/s2i/core/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd - -mkdir -p /usr/local/s2i \ - && chmod 775 /usr/local/s2i \ - && chown -R $USER:root /usr/local/s2i - # OPENJDK-2805 ln -s /usr/local/s2i /usr/libexec/s2i diff --git a/modules/s2i/core/module.yaml b/modules/s2i/core/module.yaml index 1d0938ba..28e3e88f 100644 --- a/modules/s2i/core/module.yaml +++ b/modules/s2i/core/module.yaml @@ -119,3 +119,7 @@ run: modules: install: - name: jboss.container.user + +artifacts: + - path: artifacts/s2i-core + dest: /opt/jboss/container/s2i/core diff --git a/modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh b/modules/util/logging/artifacts/logging.sh similarity index 100% rename from modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh rename to modules/util/logging/artifacts/logging.sh diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh deleted file mode 100755 index 470528df..00000000 --- a/modules/util/logging/configure.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Configure module -set -e - -SCRIPT_DIR=$(dirname $0) -ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts - -chown -R $USER:root $SCRIPT_DIR -chmod -R ug+rwX $SCRIPT_DIR -chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/util/logging/* - -pushd ${ARTIFACTS_DIR} -cp -pr * / -popd diff --git a/modules/util/logging/module.yaml b/modules/util/logging/module.yaml index ef81ff78..0c43c5da 100644 --- a/modules/util/logging/module.yaml +++ b/modules/util/logging/module.yaml @@ -14,5 +14,6 @@ modules: install: - name: jboss.container.user -execute: -- script: configure.sh +artifacts: + - path: artifacts/logging.sh + dest: /opt/jboss/container/util/logging