Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for CLOUD-3408, Allow to build image in osbs #125

Merged
merged 1 commit into from
Oct 17, 2019
Merged

Fix for CLOUD-3408, Allow to build image in osbs #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions jboss/container/wildfly/galleon/build-feature-pack/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,16 @@ if [ -d "$JBOSS_HOME/modules" ]; then
rm -rf $JBOSS_HOME/modules/
fi

if [ ! -f "$GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML" ]; then
cp $GALLEON_MAVEN_SETTINGS_XML $GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML
fi


# Install the producers and universe
mvn -f "$JBOSS_CONTAINER_WILDFLY_S2I_MODULE"/galleon/provisioning/jboss-s2i-producers/pom.xml install -Dmaven.repo.local=$GALLEON_LOCAL_MAVEN_REPO \
--settings $GALLEON_MAVEN_SETTINGS_XML
--settings $GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML
mvn -f "$JBOSS_CONTAINER_WILDFLY_S2I_MODULE"/galleon/provisioning/jboss-s2i-universe/pom.xml install -Dmaven.repo.local=$GALLEON_LOCAL_MAVEN_REPO \
--settings $GALLEON_MAVEN_SETTINGS_XML
--settings $GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML

# Copy JBOSS_HOME content (custom os content) to common package dir
CONTENT_DIR=$GALLEON_FP_PATH/src/main/resources/packages/$GALLEON_FP_COMMON_PKG_NAME/content
Expand All @@ -80,7 +84,7 @@ rm -rf $JBOSS_HOME/*

# Build Galleon s2i feature-pack and install it in local maven repository
mvn -f $GALLEON_FP_PATH/pom.xml install \
--settings $GALLEON_MAVEN_SETTINGS_XML -Dmaven.repo.local=$GALLEON_LOCAL_MAVEN_REPO $GALLEON_BUILD_FP_MAVEN_ARGS_APPEND
--settings $GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML -Dmaven.repo.local=$GALLEON_LOCAL_MAVEN_REPO $GALLEON_BUILD_FP_MAVEN_ARGS_APPEND

keepFP=${DEBUG_GALLEON_FP_SRC:-false}
if [ "x$keepFP" == "xfalse" ]; then
Expand Down
2 changes: 1 addition & 1 deletion jboss/container/wildfly/galleon/provision-server/configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
# The active profiles are jboss-community-repository and securecentral
cp "$GALLEON_DEFAULT_SERVER"/provisioning.xml "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_PROVISION"
mvn -f "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_PROVISION"/pom.xml package -Dmaven.repo.local=$GALLEON_LOCAL_MAVEN_REPO \
--settings $GALLEON_MAVEN_SETTINGS_XML $GALLEON_DEFAULT_SERVER_PROVISION_MAVEN_ARGS_APPEND
--settings $GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML $GALLEON_DEFAULT_SERVER_PROVISION_MAVEN_ARGS_APPEND

TARGET_DIR="$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_PROVISION"/target
SERVER_DIR=$TARGET_DIR/server
Expand Down
2 changes: 2 additions & 0 deletions jboss/container/wildfly/s2i/bash/module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ envs:
value: "/opt/jboss/container/wildfly/s2i/galleon/galleon-m2-repository"
- name: GALLEON_MAVEN_SETTINGS_XML
value: "/opt/jboss/container/wildfly/s2i/galleon/settings.xml"
- name: GALLEON_MAVEN_BUILD_IMG_SETTINGS_XML
value: /opt/jboss/container/wildfly/s2i/galleon/build-image-settings.xml
- name: GALLEON_S2I_FP_GROUP_ID
description: "Mandatory. groupid of s2i galleon feature-pack"
- name: GALLEON_S2I_FP_ARTIFACT_ID
Expand Down