File tree Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Expand file tree Collapse file tree 3 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ ARG DEFAULT_LOCALE=fr_FR.UTF-8
30
30
ARG MAVEN_VERSION=3.8.6
31
31
ARG MAVEN_SHA=f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
32
32
ARG WILDFLY_VERSION=26.1.2
33
- ARG JAVA_VERSION=17
33
+ ARG JAVA_VERSION=11
34
34
ARG GROOVY_VERSION=4.0.6
35
35
ARG GROOVY_SHA=e3b541567e65787279f02031206589bcdf3cdaab9328d9e4d72ad23a86aa1053
36
36
ARG NODEJS_VERSION=16
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ function checkNotEmpty() {
9
9
test " Z$1 " ! = " Z" || die " Parameter is empty"
10
10
}
11
11
12
- version=$( grep -oP ' (?<=version=)[0-9]+.[0-9]+(.[0-9]+)?' Dockerfile)
12
+ version=$( grep -oP ' (?<=version=" )[0-9]+.[0-9]+(.[0-9]+)?' Dockerfile)
13
13
while [[ $# -gt 0 ]]; do
14
14
key=" $1 "
15
15
case $key in
@@ -55,7 +55,6 @@ while [[ $# -gt 0 ]]; do
55
55
-v)
56
56
checkNotEmpty " $2 "
57
57
version=" $2 "
58
- version=1
59
58
shift # past argument
60
59
shift # past first value
61
60
;;
@@ -76,7 +75,6 @@ if git rev-parse "$version" >/dev/null 2>&1; then
76
75
git checkout $version
77
76
fi
78
77
79
-
80
78
# build the Docker image for building some of the Silverpeas projects
81
79
docker build $user $group $wildfly_version $java_version \
82
80
-t silverpeas/silverdev:$version \
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
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
4
4
5
5
if [ $# -ne 1 ]; then
6
6
echo " Missing argument: start|stop|status"
You can’t perform that action at this time.
0 commit comments