From 21c64557fa52af71942f2a60be415f6ffb3f705d Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Thu, 28 Aug 2025 12:41:40 +0100 Subject: [PATCH] [OPENJDK-4025] Revert "Merge pull request #559 from jmtd/ubi10-test-artifacts" This reverts commit f127de2fadc1fbd3af5bac5fc3e92a3f198f67a3, reversing changes made to df4546641c641242236229f06b3218aa145c7a76. --- .../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/21/configure.sh | 16 ++++++++++++++++ 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 ++--- .../container/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 ++--- .../jboss/container/maven}/s2i/maven-overrides | 0 .../jboss/container/maven}/s2i/maven-s2i | 0 .../{ => usr/libexec/s2i}/save-artifacts | 0 modules/maven/s2i/configure.sh | 15 +++++++++++++++ modules/maven/s2i/module.yaml | 9 +++------ .../container/java}/proxy/parse-proxy-url.sh | 0 .../jboss/container/java}/proxy/proxy-options | 0 .../container/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 | 5 +++++ modules/run/module.yaml | 4 ---- .../container/java/s2i}/maven-overrides | 0 .../container/java/s2i}/maven-s2i-overrides | 0 .../container/java/s2i}/s2i-core-hooks | 0 .../{libexec => usr/libexec/s2i}/assemble | 0 .../artifacts/{libexec => usr/libexec/s2i}/run | 0 .../artifacts/{libexec => usr/libexec/s2i}/usage | 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 | 6 ++++++ 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 ++--- 43 files changed, 144 insertions(+), 44 deletions(-) rename modules/jdk/21/artifacts/{ => opt/jboss/container/openjdk/jdk}/jvm-options (100%) rename modules/jre/21/artifacts/{ => opt/jboss/container/openjdk/jre}/jvm-options (100%) create mode 100755 modules/jre/21/configure.sh rename modules/jvm/artifacts/{ => opt/jboss/container/java}/jvm/debug-options (100%) mode change 100755 => 100644 rename modules/jvm/artifacts/{ => opt/jboss/container/java}/jvm/java-default-options (100%) mode change 100755 => 100644 create 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%) create 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/libexec/s2i}/save-artifacts (100%) mode change 100755 => 100644 create 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%) mode change 100755 => 100644 rename modules/proxy/artifacts/{ => opt/jboss/container/java}/proxy/translate-no-proxy.sh (100%) create mode 100755 modules/proxy/configure.sh rename modules/run/artifacts/{ => opt/jboss/container/java/run}/run-java.sh (100%) mode change 100755 => 100644 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%) rename modules/s2i/bash/artifacts/{libexec => usr/libexec/s2i}/assemble (100%) mode change 100755 => 100644 rename modules/s2i/bash/artifacts/{libexec => usr/libexec/s2i}/run (100%) mode change 100755 => 100644 rename modules/s2i/bash/artifacts/{libexec => usr/libexec/s2i}/usage (100%) mode change 100755 => 100644 create 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%) create mode 100755 modules/util/logging/configure.sh diff --git a/modules/jdk/21/artifacts/jvm-options b/modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options similarity index 100% rename from modules/jdk/21/artifacts/jvm-options rename to modules/jdk/21/artifacts/opt/jboss/container/openjdk/jdk/jvm-options diff --git a/modules/jdk/21/configure.sh b/modules/jdk/21/configure.sh index 74fa138d..f0450b47 100755 --- a/modules/jdk/21/configure.sh +++ b/modules/jdk/21/configure.sh @@ -2,6 +2,17 @@ # 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 + # Update securerandom.source for quicker starts (must be done after removing jdk 8, or it will hit the wrong files) JAVA_SECURITY_FILE=/usr/lib/jvm/java/conf/security/java.security SECURERANDOM=securerandom.source diff --git a/modules/jdk/21/module.yaml b/modules/jdk/21/module.yaml index 85834284..fe2f4a5f 100644 --- a/modules/jdk/21/module.yaml +++ b/modules/jdk/21/module.yaml @@ -33,7 +33,3 @@ modules: execute: - script: configure.sh - -artifacts: - - path: artifacts/jvm-options - dest: /opt/jboss/container/openjdk/jdk diff --git a/modules/jre/21/artifacts/jvm-options b/modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options similarity index 100% rename from modules/jre/21/artifacts/jvm-options rename to modules/jre/21/artifacts/opt/jboss/container/openjdk/jre/jvm-options diff --git a/modules/jre/21/configure.sh b/modules/jre/21/configure.sh new file mode 100755 index 00000000..fdc8f6c2 --- /dev/null +++ b/modules/jre/21/configure.sh @@ -0,0 +1,16 @@ +#!/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 diff --git a/modules/jre/21/module.yaml b/modules/jre/21/module.yaml index aba6937f..5a2ff731 100644 --- a/modules/jre/21/module.yaml +++ b/modules/jre/21/module.yaml @@ -33,7 +33,3 @@ modules: execute: - script: configure.sh - -artifacts: - - path: artifacts/jvm-options - dest: /opt/jboss/container/openjdk/jre diff --git a/modules/jvm/artifacts/jvm/debug-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options old mode 100755 new mode 100644 similarity index 100% rename from modules/jvm/artifacts/jvm/debug-options rename to modules/jvm/artifacts/opt/jboss/container/java/jvm/debug-options diff --git a/modules/jvm/artifacts/jvm/java-default-options b/modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options old mode 100755 new mode 100644 similarity index 100% rename from modules/jvm/artifacts/jvm/java-default-options rename to modules/jvm/artifacts/opt/jboss/container/java/jvm/java-default-options diff --git a/modules/jvm/configure.sh b/modules/jvm/configure.sh new file mode 100755 index 00000000..79e86ecc --- /dev/null +++ b/modules/jvm/configure.sh @@ -0,0 +1,14 @@ +#!/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 8a454e6c..c7f381b5 100644 --- a/modules/jvm/module.yaml +++ b/modules/jvm/module.yaml @@ -5,9 +5,8 @@ description: ^ Provides support for configuring Java JVM, e.g. GC settings, etc. Basic usage is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options) -artifacts: - - path: artifacts/jvm - dest: /opt/jboss/container/java/jvm +execute: +- script: configure.sh modules: install: diff --git a/modules/maven/default/artifacts/default/jboss-settings.xml b/modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml similarity index 100% rename from modules/maven/default/artifacts/default/jboss-settings.xml rename to modules/maven/default/artifacts/opt/jboss/container/maven/default/jboss-settings.xml diff --git a/modules/maven/default/artifacts/default/maven.sh b/modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh similarity index 100% rename from modules/maven/default/artifacts/default/maven.sh rename to modules/maven/default/artifacts/opt/jboss/container/maven/default/maven.sh diff --git a/modules/maven/default/configure.sh b/modules/maven/default/configure.sh index 1b634043..e94230cf 100755 --- a/modules/maven/default/configure.sh +++ b/modules/maven/default/configure.sh @@ -2,6 +2,19 @@ # 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 + # install default settings.xml file in user home mkdir -p $HOME/.m2 ln -s /opt/jboss/container/maven/default/jboss-settings.xml $HOME/.m2/settings.xml diff --git a/modules/maven/default/module.yaml b/modules/maven/default/module.yaml index 08ae2a84..e029a78e 100644 --- a/modules/maven/default/module.yaml +++ b/modules/maven/default/module.yaml @@ -8,10 +8,6 @@ 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 new file mode 100755 index 00000000..d42c27a7 --- /dev/null +++ b/modules/maven/module/configure.sh @@ -0,0 +1,7 @@ +#!/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 4128f34f..cd2b136d 100644 --- a/modules/maven/module/module.yaml +++ b/modules/maven/module/module.yaml @@ -4,6 +4,5 @@ version: '3.8' description: ^ Enables the AppStream RPM Module for Maven 3.8 packages. -artifacts: - - path: artifacts/maven.module - dest: /etc/dnf/modules.d +execute: +- script: configure.sh diff --git a/modules/maven/s2i/artifacts/s2i/maven-overrides b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides similarity index 100% rename from modules/maven/s2i/artifacts/s2i/maven-overrides rename to modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-overrides diff --git a/modules/maven/s2i/artifacts/s2i/maven-s2i b/modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i similarity index 100% rename from modules/maven/s2i/artifacts/s2i/maven-s2i rename to modules/maven/s2i/artifacts/opt/jboss/container/maven/s2i/maven-s2i diff --git a/modules/maven/s2i/artifacts/save-artifacts b/modules/maven/s2i/artifacts/usr/libexec/s2i/save-artifacts old mode 100755 new mode 100644 similarity index 100% rename from modules/maven/s2i/artifacts/save-artifacts rename to modules/maven/s2i/artifacts/usr/libexec/s2i/save-artifacts diff --git a/modules/maven/s2i/configure.sh b/modules/maven/s2i/configure.sh new file mode 100755 index 00000000..948c8a6a --- /dev/null +++ b/modules/maven/s2i/configure.sh @@ -0,0 +1,15 @@ +#!/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/libexec/s2i/* + +pushd ${ARTIFACTS_DIR} +cp -pr * / +popd diff --git a/modules/maven/s2i/module.yaml b/modules/maven/s2i/module.yaml index da17a28e..11c53490 100644 --- a/modules/maven/s2i/module.yaml +++ b/modules/maven/s2i/module.yaml @@ -23,6 +23,9 @@ envs: - name: JBOSS_CONTAINER_MAVEN_S2I_MODULE value: /opt/jboss/container/maven/s2i +execute: +- script: configure.sh + modules: install: - name: jboss.container.user @@ -33,9 +36,3 @@ 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/proxy/parse-proxy-url.sh b/modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh similarity index 100% rename from modules/proxy/artifacts/proxy/parse-proxy-url.sh rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/parse-proxy-url.sh diff --git a/modules/proxy/artifacts/proxy/proxy-options b/modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options old mode 100755 new mode 100644 similarity index 100% rename from modules/proxy/artifacts/proxy/proxy-options rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/proxy-options diff --git a/modules/proxy/artifacts/proxy/translate-no-proxy.sh b/modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh similarity index 100% rename from modules/proxy/artifacts/proxy/translate-no-proxy.sh rename to modules/proxy/artifacts/opt/jboss/container/java/proxy/translate-no-proxy.sh diff --git a/modules/proxy/configure.sh b/modules/proxy/configure.sh new file mode 100755 index 00000000..4f485eb5 --- /dev/null +++ b/modules/proxy/configure.sh @@ -0,0 +1,14 @@ +#!/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 3a50686f..ba613442 100644 --- a/modules/proxy/module.yaml +++ b/modules/proxy/module.yaml @@ -23,6 +23,5 @@ modules: install: - name: jboss.container.user -artifacts: - - path: artifacts/proxy - dest: /opt/jboss/container/java/proxy +execute: +- script: configure.sh diff --git a/modules/run/artifacts/run-java.sh b/modules/run/artifacts/opt/jboss/container/java/run/run-java.sh old mode 100755 new mode 100644 similarity index 100% rename from modules/run/artifacts/run-java.sh rename to modules/run/artifacts/opt/jboss/container/java/run/run-java.sh diff --git a/modules/run/configure.sh b/modules/run/configure.sh index 1ddb2428..218e0d0e 100755 --- a/modules/run/configure.sh +++ b/modules/run/configure.sh @@ -7,6 +7,11 @@ 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 \ diff --git a/modules/run/module.yaml b/modules/run/module.yaml index 70be354d..249e85eb 100644 --- a/modules/run/module.yaml +++ b/modules/run/module.yaml @@ -59,7 +59,3 @@ 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/opt/maven-overrides b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides similarity index 100% rename from modules/s2i/bash/artifacts/opt/maven-overrides rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-overrides diff --git a/modules/s2i/bash/artifacts/opt/maven-s2i-overrides b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides similarity index 100% rename from modules/s2i/bash/artifacts/opt/maven-s2i-overrides rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides diff --git a/modules/s2i/bash/artifacts/opt/s2i-core-hooks b/modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks similarity index 100% rename from modules/s2i/bash/artifacts/opt/s2i-core-hooks rename to modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/s2i-core-hooks diff --git a/modules/s2i/bash/artifacts/libexec/assemble b/modules/s2i/bash/artifacts/usr/libexec/s2i/assemble old mode 100755 new mode 100644 similarity index 100% rename from modules/s2i/bash/artifacts/libexec/assemble rename to modules/s2i/bash/artifacts/usr/libexec/s2i/assemble diff --git a/modules/s2i/bash/artifacts/libexec/run b/modules/s2i/bash/artifacts/usr/libexec/s2i/run old mode 100755 new mode 100644 similarity index 100% rename from modules/s2i/bash/artifacts/libexec/run rename to modules/s2i/bash/artifacts/usr/libexec/s2i/run diff --git a/modules/s2i/bash/artifacts/libexec/usage b/modules/s2i/bash/artifacts/usr/libexec/s2i/usage old mode 100755 new mode 100644 similarity index 100% rename from modules/s2i/bash/artifacts/libexec/usage rename to modules/s2i/bash/artifacts/usr/libexec/s2i/usage diff --git a/modules/s2i/bash/configure.sh b/modules/s2i/bash/configure.sh new file mode 100755 index 00000000..9c039677 --- /dev/null +++ b/modules/s2i/bash/configure.sh @@ -0,0 +1,15 @@ +#!/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/libexec/s2i/* + +pushd ${ARTIFACTS_DIR} +cp -pr * / +popd diff --git a/modules/s2i/bash/module.yaml b/modules/s2i/bash/module.yaml index 8825bde8..3199994c 100644 --- a/modules/s2i/bash/module.yaml +++ b/modules/s2i/bash/module.yaml @@ -7,6 +7,9 @@ envs: - name: JBOSS_CONTAINER_JAVA_S2I_MODULE value: /opt/jboss/container/java/s2i +execute: +- script: configure.sh + modules: install: - name: jboss.container.user @@ -17,9 +20,3 @@ modules: packages: install: - rsync - -artifacts: - - path: artifacts/libexec - dest: /usr/libexec/s2i - - path: artifacts/opt - dest: /opt/jboss/container/java/s2i diff --git a/modules/s2i/core/artifacts/s2i-core b/modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core similarity index 100% rename from modules/s2i/core/artifacts/s2i-core rename to modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh index f05075f8..d8cd9934 100755 --- a/modules/s2i/core/configure.sh +++ b/modules/s2i/core/configure.sh @@ -3,9 +3,15 @@ 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 /deployments \ && chmod -R "ug+rwX" /deployments \ diff --git a/modules/s2i/core/module.yaml b/modules/s2i/core/module.yaml index a2475984..eb24eb11 100644 --- a/modules/s2i/core/module.yaml +++ b/modules/s2i/core/module.yaml @@ -121,7 +121,3 @@ 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/logging.sh b/modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh similarity index 100% rename from modules/util/logging/artifacts/logging.sh rename to modules/util/logging/artifacts/opt/jboss/container/util/logging/logging.sh diff --git a/modules/util/logging/configure.sh b/modules/util/logging/configure.sh new file mode 100755 index 00000000..470528df --- /dev/null +++ b/modules/util/logging/configure.sh @@ -0,0 +1,14 @@ +#!/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 0c43c5da..ef81ff78 100644 --- a/modules/util/logging/module.yaml +++ b/modules/util/logging/module.yaml @@ -14,6 +14,5 @@ modules: install: - name: jboss.container.user -artifacts: - - path: artifacts/logging.sh - dest: /opt/jboss/container/util/logging +execute: +- script: configure.sh