rh-openjdk · jmtd · May 1, 2025 · Apr 11, 2025 · Apr 11, 2025
diff --git a/...t/jboss/container/openjdk/jdk/jvm-options → modules/jdk/17/artifacts/jvm-options b/...t/jboss/container/openjdk/jdk/jvm-options → modules/jdk/17/artifacts/jvm-options
diff --git 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
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jdk
diff --git a/...t/jboss/container/openjdk/jdk/jvm-options → modules/jdk/21/artifacts/jvm-options b/...t/jboss/container/openjdk/jdk/jvm-options → modules/jdk/21/artifacts/jvm-options
diff --git 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
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jdk
diff --git a/...t/jboss/container/openjdk/jre/jvm-options → modules/jre/17/artifacts/jvm-options b/...t/jboss/container/openjdk/jre/jvm-options → modules/jre/17/artifacts/jvm-options
diff --git 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
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jre
diff --git a/...t/jboss/container/openjdk/jre/jvm-options → modules/jre/21/artifacts/jvm-options b/...t/jboss/container/openjdk/jre/jvm-options → modules/jre/21/artifacts/jvm-options
diff --git 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
@@ -33,3 +33,7 @@ modules:
 
 execute:
 - script: configure.sh
+
+artifacts:
+  - path: artifacts/jvm-options
+    dest: /opt/jboss/container/openjdk/jre
diff --git a/...pt/jboss/container/java/jvm/debug-options → modules/jvm/artifacts/jvm/debug-options b/...pt/jboss/container/java/jvm/debug-options → modules/jvm/artifacts/jvm/debug-options
diff --git a/...s/container/java/jvm/java-default-options → ...es/jvm/artifacts/jvm/java-default-options b/...s/container/java/jvm/java-default-options → ...es/jvm/artifacts/jvm/java-default-options
diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh
diff --git 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/...ontainer/maven/default/jboss-settings.xml → ...ault/artifacts/default/jboss-settings.xml b/...ontainer/maven/default/jboss-settings.xml → ...ault/artifacts/default/jboss-settings.xml
diff --git a/...pt/jboss/container/maven/default/maven.sh → .../maven/default/artifacts/default/maven.sh b/...pt/jboss/container/maven/default/maven.sh → .../maven/default/artifacts/default/maven.sh
diff --git 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
@@ -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
diff --git 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/...jboss/container/maven/s2i/maven-overrides → ...s/maven/s2i/artifacts/s2i/maven-overrides b/...jboss/container/maven/s2i/maven-overrides → ...s/maven/s2i/artifacts/s2i/maven-overrides
diff --git a/...s/opt/jboss/container/maven/s2i/maven-s2i → modules/maven/s2i/artifacts/s2i/maven-s2i b/...s/opt/jboss/container/maven/s2i/maven-s2i → modules/maven/s2i/artifacts/s2i/maven-s2i
diff --git a/...2i/artifacts/usr/local/s2i/save-artifacts → modules/maven/s2i/artifacts/save-artifacts b/...2i/artifacts/usr/local/s2i/save-artifacts → 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
diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh
diff --git 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/...s/container/java/proxy/parse-proxy-url.sh → .../proxy/artifacts/proxy/parse-proxy-url.sh b/...s/container/java/proxy/parse-proxy-url.sh → .../proxy/artifacts/proxy/parse-proxy-url.sh
diff --git a/.../jboss/container/java/proxy/proxy-options → modules/proxy/artifacts/proxy/proxy-options b/.../jboss/container/java/proxy/proxy-options → modules/proxy/artifacts/proxy/proxy-options
diff --git a/...ontainer/java/proxy/translate-no-proxy.sh → ...oxy/artifacts/proxy/translate-no-proxy.sh b/...ontainer/java/proxy/translate-no-proxy.sh → ...oxy/artifacts/proxy/translate-no-proxy.sh
diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh
diff --git 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/.../opt/jboss/container/java/run/run-java.sh → modules/run/artifacts/run-java.sh b/.../opt/jboss/container/java/run/run-java.sh → modules/run/artifacts/run-java.sh
diff --git 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
@@ -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/...s2i/bash/artifacts/usr/local/s2i/assemble → modules/s2i/bash/artifacts/local/assemble b/...s2i/bash/artifacts/usr/local/s2i/assemble → modules/s2i/bash/artifacts/local/assemble
diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/run → modules/s2i/bash/artifacts/local/run b/modules/s2i/bash/artifacts/usr/local/s2i/run → modules/s2i/bash/artifacts/local/run
diff --git a/...es/s2i/bash/artifacts/usr/local/s2i/usage → modules/s2i/bash/artifacts/local/usage b/...es/s2i/bash/artifacts/usr/local/s2i/usage → modules/s2i/bash/artifacts/local/usage
diff --git a/.../jboss/container/java/s2i/maven-overrides → ...es/s2i/bash/artifacts/opt/maven-overrides b/.../jboss/container/java/s2i/maven-overrides → ...es/s2i/bash/artifacts/opt/maven-overrides
diff --git a/...ss/container/java/s2i/maven-s2i-overrides → ...2i/bash/artifacts/opt/maven-s2i-overrides b/...ss/container/java/s2i/maven-s2i-overrides → ...2i/bash/artifacts/opt/maven-s2i-overrides
diff --git a/...t/jboss/container/java/s2i/s2i-core-hooks → ...les/s2i/bash/artifacts/opt/s2i-core-hooks b/...t/jboss/container/java/s2i/s2i-core-hooks → ...les/s2i/bash/artifacts/opt/s2i-core-hooks
diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh
diff --git 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/...cts/opt/jboss/container/s2i/core/s2i-core → modules/s2i/core/artifacts/s2i-core b/...cts/opt/jboss/container/s2i/core/s2i-core → modules/s2i/core/artifacts/s2i-core
diff --git 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
@@ -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/...t/jboss/container/util/logging/logging.sh → modules/util/logging/artifacts/logging.sh b/...t/jboss/container/util/logging/logging.sh → modules/util/logging/artifacts/logging.sh
diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh
diff --git 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
diff --git 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