Merge pull request #239 from jmtd/v17-no-nss-wrapper

[OPENJDK-493] Don't install NSS Wrapper for OpenJDK17 containers

Author: jmtd

modules/run/bash/artifacts/opt/jboss/container/java/run/run-env.sh renamed to modules/run/artifacts/opt/jboss/container/java/run/run-env.sh

@@ -1,5 +1,5 @@
 schema_version: 1
-name: jboss.container.java.run.bash
+name: jboss.container.java.run
 version: '1.0'
 description: ^
   Provides support for running Java applications.  Basic usage is
@@ -48,24 +48,12 @@ envs:
 - name: JAVA_ARGS
   description: Arguments passed to the `java` application.
 
-- name: LD_PRELOAD
-  value: libnss_wrapper.so
-- name: NSS_WRAPPER_PASSWD
-  value: /home/jboss/passwd
-- name: NSS_WRAPPER_GROUP
-  value: /etc/group
-
 execute:
 - script: configure.sh
 - script: backward_compatibility.sh
 
 modules:
   install:
-  - name: jboss.container.user
   - name: jboss.container.java.jvm.bash
   - name: jboss.container.util.logging.bash
   - name: jboss.container.openjdk.jdk
-
-packages:
-  install:
-  - nss_wrapper

modules/run/bash/artifacts/opt/jboss/container/java/run/run-java.sh renamed to modules/run/artifacts/opt/jboss/container/java/run/run-java.sh

@@ -15,6 +15,6 @@ execute:
 modules:
   install:
   - name: jboss.container.maven.s2i
-  - name: jboss.container.java.run.bash
+  - name: jboss.container.java.run
   - name: jboss.container.prometheus
   - name: jboss.container.util.logging.bash

modules/run/bash/backward_compatibility.sh renamed to modules/run/backward_compatibility.sh

@@ -2,9 +2,7 @@
 set -e
 
 # Create a user and group used to launch processes
-# We use the ID 185 fot the group as well as for the user.
+# We use the ID 185 for the group as well as for the user.
 # This ID is registered static ID for the JBoss EAP product
 # on RHEL which makes it safe to use.
 groupadd -r jboss -g 185 && useradd -u 185 -r -g root -G jboss -m -d /home/jboss -s /sbin/nologin -c "JBoss user" jboss
-cp /etc/passwd /home/jboss/passwd
-chmod ug+rwX /home/jboss /home/jboss/passwd

modules/run/bash/configure.sh renamed to modules/run/configure.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+# set up a copy of the passwd file which nss_wrapper will use.
+cp /etc/passwd /home/jboss/passwd
+chmod ug+rwX /home/jboss /home/jboss/passwd

modules/run/bash/module.yaml renamed to modules/run/module.yaml

@@ -0,0 +1,27 @@
+schema_version: 1
+name: jboss.container.util.nss-wrapper
+version: '1.0'
+description: ^
+  Installs and configures NSS wrapper.
+  See <https://issues.redhat.com/browse/OPENJDK-312>.
+
+envs:
+- name: LD_PRELOAD
+  value: libnss_wrapper.so
+- name: NSS_WRAPPER_PASSWD
+  value: /home/jboss/passwd
+- name: NSS_WRAPPER_GROUP
+  value: /etc/group
+
+execute:
+- script: configure.sh
+
+packages:
+  install:
+  - nss_wrapper
+
+# We don't explicitly depend on jboss.container.user but that module must
+# be evaluated before this one.
+modules:
+  install:
+  - name: jboss.container.user

modules/s2i/bash/module.yaml

@@ -44,6 +44,7 @@ modules:
     version: "7"
   - name: jboss.container.jolokia
     version: "7"
+  - name: jboss.container.util.nss-wrapper
   - name: jboss.container.java.s2i.bash
   - name: jboss.container.maven
     version: "7.0.3.6"