Skip to content

Commit 947824c

Browse files
committed
Allow infinispan setup script to run on ubi minimal
1 parent 3a279cf commit 947824c

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

ga/latest/kernel/helpers/build/infinispan-client-setup.sh

+10-3
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,20 @@
1616

1717
set -Eeox pipefail
1818

19-
yum update -y
20-
yum install -y maven
19+
pkgcmd=yum
20+
if ! command $pkgcmd
21+
then
22+
pkgcmd=microdnf
23+
fi
24+
25+
$pkgcmd update -y
26+
$pkgcmd install -y maven
2127
mkdir -p /opt/ibm/wlp/usr/shared/resources/infinispan
2228
echo '<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>io.openliberty</groupId> <artifactId>openliberty-infinispan-client</artifactId> <version>1.0</version> <!-- https://mvnrepository.com/artifact/org.infinispan/infinispan-jcache-remote --> <dependencies> <dependency> <groupId>org.infinispan</groupId> <artifactId>infinispan-jcache-remote</artifactId> <version>10.1.3.Final</version> </dependency> </dependencies></project>' > /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
2329
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml versions:use-latest-releases -DallowMajorUpdates=false
2430
mvn -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml dependency:copy-dependencies -DoutputDirectory=/opt/ibm/wlp/usr/shared/resources/infinispan
25-
yum remove -y maven
31+
# This fails with dependency errors using microdnf on ubi-minimal, but it is okay to let it fail
32+
yum remove -y maven || true
2633
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/pom.xml
2734
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/jboss-transaction-api*.jar
2835
rm -f /opt/ibm/wlp/usr/shared/resources/infinispan/reactive-streams-*.jar

0 commit comments

Comments
 (0)