Skip to content

Commit a595d9a

Browse files
spoltiluck3y
authored andcommitted
[RHPAM-2855] - Broken symlink in registry.redhat.io/rhpam-7/rhpam-kieserver-rhel8 image (#397)
Signed-off-by: spolti <[email protected]>
1 parent 406e82a commit a595d9a

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#!/bin/sh
22
# Configure module
33
set -e
4-
54
# For backward compatibility
65
mkdir -p /usr/local/s2i
7-
ln -s /opt/jboss/container/maven/default/scl-enable-maven /usr/local/s2i/scl-enable-maven
8-
chown -h jboss:root /usr/local/s2i/scl-enable-maven
6+
# scl-enable-maven is not needed on ubi8 images.
7+
if test -r "${JBOSS_CONTAINER_MAVEN_DEFAULT_MODULE}/scl-enable-maven"; then
8+
ln -s /opt/jboss/container/maven/default/scl-enable-maven /usr/local/s2i/scl-enable-maven
9+
chown -h jboss:root /usr/local/s2i/scl-enable-maven
10+
fi
11+
912
ln -s /opt/jboss/container/maven/default/maven.sh /usr/local/s2i/common.sh
1013
chown -h jboss:root /usr/local/s2i/common.sh

jboss/container/maven/default/configure.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ popd
1818
MAVEN_VERSION_SQUASHED=${MAVEN_VERSION/./}
1919

2020
# pull in specific maven version to serve as default
21-
ln -s /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/* /opt/jboss/container/maven/default
21+
for f in /opt/jboss/container/maven/${MAVEN_VERSION_SQUASHED}/*; do
22+
if test -f "$f"; then
23+
ln -s "$f" /opt/jboss/container/maven/default;
24+
fi;
25+
done
2226
chown -h jboss:root /opt/jboss/container/maven/default/*
2327

2428
# install default settings.xml file in user home

0 commit comments

Comments
 (0)