Skip to content

Commit a3900e8

Browse files
committed
Revert "Changes to add CMD for runtime images"
This reverts commit 9b03cc8. Also, -Add "jboss.container.java.run" to 8u, 11u and 17u runtime descriptors. -Remove "jboss.container.openjdk.jdk" from modules/run/module.yaml -Tweak modules/run/module.yaml to match the need for javasecurity value for 8u runtime JAVA_HOME Signed-off-by: Jayashree Huttanagoudar <[email protected]>
1 parent 7101f82 commit a3900e8

File tree

8 files changed

+6
-49
lines changed

8 files changed

+6
-49
lines changed

modules/jre/run/artifacts/opt/jboss/container/java/run

Lines changed: 0 additions & 10 deletions
This file was deleted.

modules/jre/run/configure.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

modules/jre/run/module.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

modules/run/configure.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ mkdir -p /deployments/data \
2121
if [ -w ${JAVA_HOME}/jre/lib/security/java.security ]; then
2222
# JDK8 location
2323
javasecurity="${JAVA_HOME}/jre/lib/security/java.security"
24+
elif [ -w ${JAVA_HOME}/lib/security/java.security ]; then
25+
# JDK8 JRE location
26+
javasecurity="${JAVA_HOME}/lib/security/java.security"
2427
else
2528
# JDK11 location
2629
javasecurity="${JAVA_HOME}/conf/security/java.security"

modules/run/module.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ modules:
5959
install:
6060
- name: jboss.container.java.jvm.bash
6161
- name: jboss.container.util.logging.bash
62-
- name: jboss.container.openjdk.jdk

ubi8-openjdk-11-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ modules:
4040
- name: jboss.container.util.pkg-update
4141
- name: jboss.container.openjdk.jre
4242
version: "11"
43-
- name: jboss.container.java.jre.run
43+
- name: jboss.container.java.run
4444

4545
help:
4646
add: true

ubi8-openjdk-17-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ modules:
4242
- name: jboss.container.util.pkg-update
4343
- name: jboss.container.openjdk.jre
4444
version: "17"
45-
- name: jboss.container.java.jre.run
45+
- name: jboss.container.java.run
4646

4747
help:
4848
add: true

ubi8-openjdk-8-runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ modules:
4040
- name: jboss.container.util.pkg-update
4141
- name: jboss.container.openjdk.jre
4242
version: "8"
43-
- name: jboss.container.java.jre.run
43+
- name: jboss.container.java.run
4444

4545
help:
4646
add: true

0 commit comments

Comments
 (0)