From 4d838f760fb94a00929776240702d0e8bff43c20 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Fri, 15 Nov 2024 16:50:33 +0000 Subject: [PATCH] [OPENJDK-3653] install s2i scripts to libexec This is the conventional path for the scripts. Signed-off-by: Jonathan Dowland --- .../artifacts/usr/{local => libexec}/s2i/save-artifacts | 0 modules/maven/s2i/configure.sh | 2 +- modules/run/tests/features/java.runtime.feature | 2 -- .../s2i/bash/artifacts/usr/{local => libexec}/s2i/assemble | 0 modules/s2i/bash/artifacts/usr/{local => libexec}/s2i/run | 0 .../s2i/bash/artifacts/usr/{local => libexec}/s2i/usage | 0 modules/s2i/bash/configure.sh | 2 +- modules/s2i/core/configure.sh | 7 ------- modules/s2i/core/module.yaml | 6 ++++-- tests/features/imagebasic.feature | 2 +- ubi10-openjdk-21-runtime.yaml | 3 +++ ubi10-openjdk-21.yaml | 3 ++- 12 files changed, 12 insertions(+), 15 deletions(-) rename modules/maven/s2i/artifacts/usr/{local => libexec}/s2i/save-artifacts (100%) rename modules/s2i/bash/artifacts/usr/{local => libexec}/s2i/assemble (100%) rename modules/s2i/bash/artifacts/usr/{local => libexec}/s2i/run (100%) rename modules/s2i/bash/artifacts/usr/{local => libexec}/s2i/usage (100%) diff --git a/modules/maven/s2i/artifacts/usr/local/s2i/save-artifacts b/modules/maven/s2i/artifacts/usr/libexec/s2i/save-artifacts similarity index 100% rename from modules/maven/s2i/artifacts/usr/local/s2i/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 index 3be021b0..948c8a6a 100755 --- a/modules/maven/s2i/configure.sh +++ b/modules/maven/s2i/configure.sh @@ -8,7 +8,7 @@ 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/* +chmod ug+x ${ARTIFACTS_DIR}/usr/libexec/s2i/* pushd ${ARTIFACTS_DIR} cp -pr * / diff --git a/modules/run/tests/features/java.runtime.feature b/modules/run/tests/features/java.runtime.feature index 98eb58fa..e0b18d08 100644 --- a/modules/run/tests/features/java.runtime.feature +++ b/modules/run/tests/features/java.runtime.feature @@ -8,8 +8,6 @@ Feature: Openshift OpenJDK Runtime tests (OPENJDK-474, OPENJDK-2805) | JAVA_DIAGNOSTICS | true | Then container log should contain /deployments/undertow-servlet.jar unique And container log should contain -XX:NativeMemoryTracking=summary - And file /usr/local/s2i/run should exist - And file /usr/local/s2i/run should not contain JVM_ARGS And file /usr/libexec/s2i/run should exist And file /usr/libexec/s2i/run should not contain JVM_ARGS And container log should not contain unique unique diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/usr/libexec/s2i/assemble similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/assemble rename to modules/s2i/bash/artifacts/usr/libexec/s2i/assemble diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/run b/modules/s2i/bash/artifacts/usr/libexec/s2i/run similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/run rename to modules/s2i/bash/artifacts/usr/libexec/s2i/run diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/usage b/modules/s2i/bash/artifacts/usr/libexec/s2i/usage similarity index 100% rename from modules/s2i/bash/artifacts/usr/local/s2i/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 index a56b65c9..9c039677 100755 --- a/modules/s2i/bash/configure.sh +++ b/modules/s2i/bash/configure.sh @@ -8,7 +8,7 @@ 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/* +chmod ug+x ${ARTIFACTS_DIR}/usr/libexec/s2i/* pushd ${ARTIFACTS_DIR} cp -pr * / diff --git a/modules/s2i/core/configure.sh b/modules/s2i/core/configure.sh index 032068e6..d8cd9934 100755 --- a/modules/s2i/core/configure.sh +++ b/modules/s2i/core/configure.sh @@ -13,13 +13,6 @@ 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 - mkdir -p /deployments \ && chmod -R "ug+rwX" /deployments \ && chown -R $USER:root /deployments diff --git a/modules/s2i/core/module.yaml b/modules/s2i/core/module.yaml index 1d0938ba..eb24eb11 100644 --- a/modules/s2i/core/module.yaml +++ b/modules/s2i/core/module.yaml @@ -12,8 +12,9 @@ packages: - rsync labels: + # XXX this modules does not install files in this path - name: "io.openshift.s2i.scripts-url" - value: "image:///usr/local/s2i" + value: "image:///usr/libexec/s2i" - name: io.openshift.s2i.destination value: "/tmp" - name: org.jboss.container.deployments-dir @@ -114,7 +115,8 @@ envs: run: cmd: - - "/usr/local/s2i/run" + # XXX this script is in a different module + - "/usr/libexec/s2i/run" modules: install: diff --git a/tests/features/imagebasic.feature b/tests/features/imagebasic.feature index 4e392895..b4b59790 100644 --- a/tests/features/imagebasic.feature +++ b/tests/features/imagebasic.feature @@ -12,4 +12,4 @@ Feature: Tests for all openshift images @ubi10/openjdk-21 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 + Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/libexec/s2i diff --git a/ubi10-openjdk-21-runtime.yaml b/ubi10-openjdk-21-runtime.yaml index a4f7e835..e7eeae14 100644 --- a/ubi10-openjdk-21-runtime.yaml +++ b/ubi10-openjdk-21-runtime.yaml @@ -30,6 +30,9 @@ labels: value: *version envs: + # XXX should this move to an s2i module? +- name: PATH + value: $PATH:"/usr/libexec/s2i" - name: "JBOSS_IMAGE_NAME" value: *name - name: "JBOSS_IMAGE_VERSION" diff --git a/ubi10-openjdk-21.yaml b/ubi10-openjdk-21.yaml index bf5c3ed9..9105dcdb 100644 --- a/ubi10-openjdk-21.yaml +++ b/ubi10-openjdk-21.yaml @@ -30,8 +30,9 @@ labels: value: *version envs: + # XXX should this move to an s2i module? - name: PATH - value: $PATH:"/usr/local/s2i" + value: $PATH:"/usr/libexec/s2i" - name: "JBOSS_IMAGE_NAME" value: *name - name: "JBOSS_IMAGE_VERSION"