Skip to content

Commit 27432e4

Browse files
committed
Fix issue in the build.sh script.
Take into account Wildfly 26.1.2
1 parent a5a5b9e commit 27432e4

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG DEFAULT_LOCALE=fr_FR.UTF-8
3030
ARG MAVEN_VERSION=3.8.6
3131
ARG MAVEN_SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
3232
ARG WILDFLY_VERSION=26.1.2
33-
ARG JAVA_VERSION=17
33+
ARG JAVA_VERSION=11
3434
ARG GROOVY_VERSION=4.0.6
3535
ARG GROOVY_SHA=e3b541567e65787279f02031206589bcdf3cdaab9328d9e4d72ad23a86aa1053
3636
ARG NODEJS_VERSION=16

build.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function checkNotEmpty() {
99
test "Z$1" != "Z" || die "Parameter is empty"
1010
}
1111

12-
version=$(grep -oP '(?<=version=)[0-9]+.[0-9]+(.[0-9]+)?' Dockerfile)
12+
version=$(grep -oP '(?<=version=")[0-9]+.[0-9]+(.[0-9]+)?' Dockerfile)
1313
while [[ $# -gt 0 ]]; do
1414
key="$1"
1515
case $key in
@@ -55,7 +55,6 @@ while [[ $# -gt 0 ]]; do
5555
-v)
5656
checkNotEmpty "$2"
5757
version="$2"
58-
version=1
5958
shift # past argument
6059
shift # past first value
6160
;;
@@ -76,7 +75,6 @@ if git rev-parse "$version" >/dev/null 2>&1; then
7675
git checkout $version
7776
fi
7877

79-
8078
# build the Docker image for building some of the Silverpeas projects
8179
docker build $user $group $wildfly_version $java_version \
8280
-t silverpeas/silverdev:$version \

src/wildfly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
WILDFLY_HOME=/opt/wildfly-for-tests/wildfly-26.1.1.Final
3+
WILDFLY_HOME=/opt/wildfly-for-tests/wildfly---build-arg WILDFLY_VERSION=26.1.2.Final
44

55
if [ $# -ne 1 ]; then
66
echo "Missing argument: start|stop|status"

0 commit comments

Comments
 (0)