Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions modules/jdk/21/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions modules/jdk/21/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,3 @@ modules:

execute:
- script: configure.sh

artifacts:
- path: artifacts/jvm-options
dest: /opt/jboss/container/openjdk/jdk
16 changes: 16 additions & 0 deletions modules/jre/21/configure.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions modules/jre/21/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,3 @@ modules:

execute:
- script: configure.sh

artifacts:
- path: artifacts/jvm-options
dest: /opt/jboss/container/openjdk/jre
File renamed without changes.
File renamed without changes.
14 changes: 14 additions & 0 deletions modules/jvm/configure.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions modules/jvm/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions modules/maven/default/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions modules/maven/default/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions modules/maven/module/configure.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions modules/maven/module/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
15 changes: 15 additions & 0 deletions modules/maven/s2i/configure.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 3 additions & 6 deletions modules/maven/s2i/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
File renamed without changes.
14 changes: 14 additions & 0 deletions modules/proxy/configure.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions modules/proxy/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ modules:
install:
- name: jboss.container.user

artifacts:
- path: artifacts/proxy
dest: /opt/jboss/container/java/proxy
execute:
- script: configure.sh
File renamed without changes.
5 changes: 5 additions & 0 deletions modules/run/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions modules/run/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 15 additions & 0 deletions modules/s2i/bash/configure.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 3 additions & 6 deletions modules/s2i/bash/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 6 additions & 0 deletions modules/s2i/core/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions modules/s2i/core/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,3 @@ run:
modules:
install:
- name: jboss.container.user

artifacts:
- path: artifacts/s2i-core
dest: /opt/jboss/container/s2i/core
14 changes: 14 additions & 0 deletions modules/util/logging/configure.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions modules/util/logging/module.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading