Skip to content

Commit 5d6d656

Browse files
authored
Merge pull request #188 from jfdenise/patching
[0.18.x] Fix for Issue #187, Add ability to execute a script once the maven repository has been unzipped.
2 parents b19ea54 + e73bd03 commit 5d6d656

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

jboss/container/wildfly/galleon/build-feature-pack/configure.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ if [ -f "${ZIPPED_REPO}" ]; then
3333
echo "Found zipped repository, installing it."
3434
unzip ${ZIPPED_REPO} -d /tmp
3535
repoDir=$(find /tmp -type d -iname "*-image-builder-maven-repository")
36+
37+
# hook to allow for maven-repo processing before to initiate feature-pack build
38+
if [ -f "$GALLEON_MAVEN_REPO_HOOK_SCRIPT" ]; then
39+
sh $GALLEON_MAVEN_REPO_HOOK_SCRIPT "$repoDir"
40+
fi
3641
mv $repoDir/maven-repository "$TMP_GALLEON_LOCAL_MAVEN_REPO"
3742

3843
if [ "x$deleteBuildArtifacts" == "xtrue" ]; then

jboss/container/wildfly/s2i/bash/module.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ envs:
2424
value: "/opt/jboss/container/wildfly/s2i/galleon/settings.xml"
2525
- name: GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML
2626
value: /opt/jboss/container/wildfly/s2i/galleon/build-image-settings.xml
27+
- name: GALLEON_MAVEN_REPO_HOOK_SCRIPT
28+
description: "Optional, path to a bash script to execute once the maven repository has been unzipped. Script is called with path to maven repo as argument."
2729
- name: GALLEON_S2I_FP_GROUP_ID
2830
description: "Mandatory. groupid of s2i galleon feature-pack"
2931
- name: GALLEON_S2I_FP_ARTIFACT_ID
3032
description: "Mandatory. artifactid of s2i galleon feature-pack"
3133
- name: GALLEON_VERSION
3234
value: "4.2.4.Final"
3335
- name: GALLEON_WILDFLY_VERSION
34-
value: "4.2.4.Final"
36+
value: "4.2.7.Final"
3537
description: "Set to true to explicitly add org.wildfly:wildfly-datasources-galleon-pack to provisoned galleon feature-packs."
3638
- name: GALLEON_S2I_PRODUCER_NAME
3739
description: Mandatory. Name of the built feature-pack producer.

0 commit comments

Comments
 (0)