Skip to content

Commit 460f1d1

Browse files
rncrnc
committed
Embed alt-deploy-maven-extension
1 parent a3a07bd commit 460f1d1

File tree

4 files changed

+39
-24
lines changed

4 files changed

+39
-24
lines changed

‎generate.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ generate () {
77

88
export IMAGE_NAME=jbs-ubi$UBI-builder
99
mkdir -p $DIR/$IMAGE_NAME
10-
#deal with gradle and sbt and ant
11-
1210
export TOOL_STRING=""
1311

1412
ant=`yq .spec.builders.ubi$UBI.tag $DIR/image-config.yaml | grep -o -E "ant:.*,?" | cut -d , -f 1 | cut -d : -f 2`
@@ -21,16 +19,6 @@ generate () {
2119
export TOOL_STRING="${TOOL_STRING:+$TOOL_STRING }$res"$'\n'
2220
done
2321

24-
sbt=`yq .spec.builders.ubi$UBI.tag $DIR/image-config.yaml | grep -o -E "sbt:.*,?" | cut -d , -f 1 | cut -d : -f 2`
25-
echo sbt $sbt
26-
for i in ${sbt//;/ }
27-
do
28-
export SBT_VERSION=$i
29-
export SBT_DOWNLOAD_SHA256=$(name=SBT_${SBT_VERSION//./_} && echo ${!name})
30-
res=`envsubst '$SBT_DOWNLOAD_SHA256,$SBT_VERSION' < $DIR/sbt.template`
31-
export TOOL_STRING="${TOOL_STRING:+$TOOL_STRING }$res"$'\n'
32-
done
33-
3422
gradle=`yq .spec.builders.ubi$UBI.tag $DIR/image-config.yaml | grep -o -E "gradle:.*,?" | cut -d , -f 1 | cut -d : -f 2`
3523
echo gradle $gradle
3624
for i in ${gradle//;/ }
@@ -47,7 +35,17 @@ generate () {
4735
do
4836
export MAVEN_VERSION=$i
4937
export MAVEN_DOWNLOAD_SHA512=$(name=MAVEN_${MAVEN_VERSION//./_} && echo ${!name})
50-
res=`envsubst '$MAVEN_DOWNLOAD_SHA512,$MAVEN_VERSION' < $DIR/maven.template`
38+
res=`envsubst '$ALT_DEPLOY_1_8,$MAVEN_DOWNLOAD_SHA512,$MAVEN_VERSION' < $DIR/maven.template`
39+
export TOOL_STRING="${TOOL_STRING:+$TOOL_STRING }$res"$'\n'
40+
done
41+
42+
sbt=`yq .spec.builders.ubi$UBI.tag $DIR/image-config.yaml | grep -o -E "sbt:.*,?" | cut -d , -f 1 | cut -d : -f 2`
43+
echo sbt $sbt
44+
for i in ${sbt//;/ }
45+
do
46+
export SBT_VERSION=$i
47+
export SBT_DOWNLOAD_SHA256=$(name=SBT_${SBT_VERSION//./_} && echo ${!name})
48+
res=`envsubst '$SBT_DOWNLOAD_SHA256,$SBT_VERSION' < $DIR/sbt.template`
5149
export TOOL_STRING="${TOOL_STRING:+$TOOL_STRING }$res"$'\n'
5250
done
5351
export TOOL_STRING="$TOOL_STRING && echo \"Completed tool installation\""
@@ -67,6 +65,8 @@ generate () {
6765

6866
export MAVEN_3_8_8=aa7d431c07714c410e53502b630f91fc22d2664d5974a413471a2bd4fca9c31f98fbc397d613b7c3e31d3615a9f18487867975b1332462baf7d6ca58ef3628f9
6967
export MAVEN_3_9_5=ca59380b839c6bea8f464a08bb7873a1cab91007b95876ba9ed8a9a2b03ceac893e661d218ba3d4af3ccf46d26600fc4c59fccabba9d7b2cc4adcd8aecc1df2a
68+
export ALT_DEPLOY_1_8=6818489c1a44a3f119d4a825aa3b084a148f0fab1b9d6601c1430a5dc7a86a06cc56462fcc581206bdf0b6680587ae159a91369a4eba1bfbc5e9f6f9d37cd5a9
69+
7070

7171
export GRADLE_8_9=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
7272
export GRADLE_8_7=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d

‎jbs-ubi7-builder/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ RUN set -o errexit -o nounset \
6060
&& echo "Installing Maven 3.8.8" \
6161
&& unzip -q maven.zip \
6262
&& rm maven.zip \
63+
&& echo "Adding alt-deploy-maven-extension" \
64+
&& wget --no-verbose --output-document="apache-maven-3.8.8"/lib/ext/alt-deploy-maven-extension.jar "https://repo1.maven.org/maven2/org/goots/maven/extensions/alt-deploy-maven-extension/1.8/alt-deploy-maven-extension-1.8.jar" \
65+
&& echo "6818489c1a44a3f119d4a825aa3b084a148f0fab1b9d6601c1430a5dc7a86a06cc56462fcc581206bdf0b6680587ae159a91369a4eba1bfbc5e9f6f9d37cd5a9 apache-maven-3.8.8/lib/ext/alt-deploy-maven-extension.jar" | sha512sum --check - \
6366
&& mv "apache-maven-3.8.8" "/opt/maven/3.8.8/" \
6467
\
6568
\
@@ -70,6 +73,9 @@ RUN set -o errexit -o nounset \
7073
&& echo "Installing Maven 3.9.5" \
7174
&& unzip -q maven.zip \
7275
&& rm maven.zip \
76+
&& echo "Adding alt-deploy-maven-extension" \
77+
&& wget --no-verbose --output-document="apache-maven-3.9.5"/lib/ext/alt-deploy-maven-extension.jar "https://repo1.maven.org/maven2/org/goots/maven/extensions/alt-deploy-maven-extension/1.8/alt-deploy-maven-extension-1.8.jar" \
78+
&& echo "6818489c1a44a3f119d4a825aa3b084a148f0fab1b9d6601c1430a5dc7a86a06cc56462fcc581206bdf0b6680587ae159a91369a4eba1bfbc5e9f6f9d37cd5a9 apache-maven-3.9.5/lib/ext/alt-deploy-maven-extension.jar" | sha512sum --check - \
7379
&& mv "apache-maven-3.9.5" "/opt/maven/3.9.5/" \
7480
&& echo "Completed tool installation"
7581

‎jbs-ubi8-builder/Dockerfile

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,6 @@ RUN set -o errexit -o nounset \
5353
&& for i in antunit ivy logging junit xml networking regexp antlr bcel jdepend bsf debugging script javamail jspc; do echo "Processing $i" ; $ANT_HOME/bin/ant -S -f fetch.xml -Ddest=system $i; done \
5454
\
5555
\
56-
&& echo "Downloading SBT 1.8.0" \
57-
&& wget --no-verbose --output-document=sbt.zip "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.zip" \
58-
&& echo "Checking download hash 1.8.0" \
59-
&& echo "fb52ea0bc0761176f3e38923ae5df556fba372895efb98a587f706d1ae805897 *sbt.zip" | sha256sum --check - \
60-
&& echo "Installing SBT 1.8.0" \
61-
&& unzip -q sbt.zip \
62-
&& rm sbt.zip \
63-
&& mv "sbt" "/opt/sbt/1.8.0/" \
64-
&& export SBT_HOME=/opt/sbt/1.8.0 \
65-
\
66-
\
6756
&& echo "Downloading Gradle 8.9" \
6857
&& wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-8.9-bin.zip" \
6958
&& echo "Checking download hash 8.9" \
@@ -251,6 +240,9 @@ RUN set -o errexit -o nounset \
251240
&& echo "Installing Maven 3.8.8" \
252241
&& unzip -q maven.zip \
253242
&& rm maven.zip \
243+
&& echo "Adding alt-deploy-maven-extension" \
244+
&& wget --no-verbose --output-document="apache-maven-3.8.8"/lib/ext/alt-deploy-maven-extension.jar "https://repo1.maven.org/maven2/org/goots/maven/extensions/alt-deploy-maven-extension/1.8/alt-deploy-maven-extension-1.8.jar" \
245+
&& echo "6818489c1a44a3f119d4a825aa3b084a148f0fab1b9d6601c1430a5dc7a86a06cc56462fcc581206bdf0b6680587ae159a91369a4eba1bfbc5e9f6f9d37cd5a9 apache-maven-3.8.8/lib/ext/alt-deploy-maven-extension.jar" | sha512sum --check - \
254246
&& mv "apache-maven-3.8.8" "/opt/maven/3.8.8/" \
255247
\
256248
\
@@ -261,7 +253,21 @@ RUN set -o errexit -o nounset \
261253
&& echo "Installing Maven 3.9.5" \
262254
&& unzip -q maven.zip \
263255
&& rm maven.zip \
256+
&& echo "Adding alt-deploy-maven-extension" \
257+
&& wget --no-verbose --output-document="apache-maven-3.9.5"/lib/ext/alt-deploy-maven-extension.jar "https://repo1.maven.org/maven2/org/goots/maven/extensions/alt-deploy-maven-extension/1.8/alt-deploy-maven-extension-1.8.jar" \
258+
&& echo "6818489c1a44a3f119d4a825aa3b084a148f0fab1b9d6601c1430a5dc7a86a06cc56462fcc581206bdf0b6680587ae159a91369a4eba1bfbc5e9f6f9d37cd5a9 apache-maven-3.9.5/lib/ext/alt-deploy-maven-extension.jar" | sha512sum --check - \
264259
&& mv "apache-maven-3.9.5" "/opt/maven/3.9.5/" \
260+
\
261+
\
262+
&& echo "Downloading SBT 1.8.0" \
263+
&& wget --no-verbose --output-document=sbt.zip "https://github.com/sbt/sbt/releases/download/v1.8.0/sbt-1.8.0.zip" \
264+
&& echo "Checking download hash 1.8.0" \
265+
&& echo "fb52ea0bc0761176f3e38923ae5df556fba372895efb98a587f706d1ae805897 *sbt.zip" | sha256sum --check - \
266+
&& echo "Installing SBT 1.8.0" \
267+
&& unzip -q sbt.zip \
268+
&& rm sbt.zip \
269+
&& mv "sbt" "/opt/sbt/1.8.0/" \
270+
&& export SBT_HOME=/opt/sbt/1.8.0 \
265271
&& echo "Completed tool installation"
266272

267273
LABEL \

‎maven.template

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
&& echo "Installing Maven $MAVEN_VERSION" \
88
&& unzip -q maven.zip \
99
&& rm maven.zip \
10+
&& echo "Adding alt-deploy-maven-extension" \
11+
&& wget --no-verbose --output-document="apache-maven-$MAVEN_VERSION"/lib/ext/alt-deploy-maven-extension.jar "https://repo1.maven.org/maven2/org/goots/maven/extensions/alt-deploy-maven-extension/1.8/alt-deploy-maven-extension-1.8.jar" \
12+
&& echo "$ALT_DEPLOY_1_8 apache-maven-$MAVEN_VERSION/lib/ext/alt-deploy-maven-extension.jar" | sha512sum --check - \
1013
&& mv "apache-maven-$MAVEN_VERSION" "/opt/maven/$MAVEN_VERSION/" \

0 commit comments

Comments
 (0)