Skip to content

Commit 05f7c2b

Browse files
committed
WIP: convert installing some things over to artifacts:
1 parent 0d52d05 commit 05f7c2b

37 files changed

+39
-116
lines changed

modules/jvm/configure.sh

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

modules/jvm/module.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ description: ^
55
Provides support for configuring Java JVM, e.g. GC settings, etc. Basic usage
66
is opts=$($JBOSS_CONTAINER_JAVA_JVM_MODULE/java-default-options)
77

8-
execute:
9-
- script: configure.sh
8+
artifacts:
9+
- path: artifacts/jvm
10+
dest: /opt/jboss/container/java
1011

1112
modules:
1213
install:

modules/maven/default/configure.sh

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,14 @@
33
set -e
44

55
SCRIPT_DIR=$(dirname $0)
6-
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7-
8-
# configure artifact permissions
9-
chown -R $USER:root $ARTIFACTS_DIR
10-
chmod -R ug+rwX $ARTIFACTS_DIR
11-
chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/maven/default/maven.sh
12-
13-
# install artifacts
14-
pushd ${ARTIFACTS_DIR}
15-
cp -pr * /
16-
popd
176

187
MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
198

209
# pull in specific maven version to serve as default
2110
ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
22-
chown -h $USER:root /opt/jboss/container/maven/default/*
11+
12+
# XXX: doesn't exist yet
13+
# chown -h $USER:root /opt/jboss/container/maven/default/*
2314

2415
# install default settings.xml file in user home
2516
mkdir -p $HOME/.m2

modules/maven/default/module.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ description: ^
88
execute:
99
- script: configure.sh
1010

11+
artifacts:
12+
- path: artifacts/default
13+
dest: opt/jboss/container/maven
14+
1115
modules:
1216
install:
1317
- name: jboss.container.user

modules/maven/module/configure.sh

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

modules/maven/module/module.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ version: '3.8'
44
description: ^
55
Enables the AppStream RPM Module for Maven 3.8 packages.
66

7-
execute:
8-
- script: configure.sh
7+
artifacts:
8+
- path: artifacts/maven.module
9+
dest: /etc/dnf/modules.d

0 commit comments

Comments
 (0)