@@ -23,7 +23,7 @@ readonly USERID=1000
23
23
readonly GROUPID=1000
24
24
readonly UNAME=tomcat
25
25
26
- function help(){
26
+ function help() {
27
27
if [ " $# " -ne 5 ] ; then
28
28
echo " Usage: $0 [docker image tag] [geoserver version] [geoserver main version] [datadir|nodatadir] [pull|no_pull];"
29
29
echo " " ;
@@ -39,11 +39,10 @@ function help(){
39
39
40
40
function clean_up_directory() {
41
41
# we shall never clean datadir
42
- rm -rf ./resources/geoserver-plugins/* ./resources/geoserver/*
42
+ echo " rm -rf ./resources/geoserver-plugins/* ./resources/geoserver/*"
43
43
}
44
44
function create_plugins_folder() {
45
45
mkdir -p ./resources/geoserver-plugins
46
-
47
46
}
48
47
49
48
function download_from_url_to_a_filepath {
@@ -67,7 +66,6 @@ function download_plugin() {
67
66
PLUGIN_FULL_NAME=geoserver-${GEOSERVER_VERSION% .* } -SNAPSHOT-${PLUGIN_NAME} -plugin.zip
68
67
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL} /${GEOSERVER_VERSION} /${TYPE} -latest/${PLUGIN_FULL_NAME}
69
68
;;
70
-
71
69
" main" )
72
70
PLUGIN_FULL_NAME=geoserver-${GEOSERVER_MASTER_VERSION% .* } -SNAPSHOT-${PLUGIN_NAME} -plugin.zip
73
71
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL} /${GEOSERVER_VERSION} /${TYPE} -latest/${PLUGIN_FULL_NAME}
@@ -84,20 +82,18 @@ function download_plugin() {
84
82
PLUGIN_ARTIFACT_URL=${BASE_BUILD_URL} /${GEOSERVER_VERSION% .* } .x/${TYPE} -latest/${PLUGIN_FULL_NAME}
85
83
fi
86
84
;;
87
-
88
85
esac
89
-
90
86
download_from_url_to_a_filepath " ${PLUGIN_ARTIFACT_URL} " " ${PLUGIN_ARTIFACT_DIRECTORY} /${PLUGIN_FULL_NAME} "
91
87
}
92
88
93
- function download_fonts() {
89
+ function download_fonts() {
94
90
if [ ! -e " ${FONTS_ARTIFACT_DIRECTORY} " ]; then
95
91
mkdir -p " ${FONTS_ARTIFACT_DIRECTORY} "
96
92
fi
97
93
download_from_url_to_a_filepath " ${EXTRA_FONTS_URL} " " ${FONTS_ARTIFACT_DIRECTORY} /fonts.tar.gz"
98
94
}
99
95
100
- function download_marlin() {
96
+ function download_marlin() {
101
97
IFS=' .' read -r -a marlin_v_arr <<< " $MARLIN_VERSION"
102
98
unset IFS
103
99
@@ -142,8 +138,7 @@ function download_geoserver() {
142
138
143
139
144
140
function build_with_data_dir() {
145
-
146
- local TAG=${1}
141
+ local TAG=${1}
147
142
local PULL_ENABLED=${2}
148
143
DOCKER_VERSION=" $( docker --version | grep " Docker version" | awk ' {print $3}' | sed ' s/,//' ) "
149
144
case $DOCKER_VERSION in
@@ -183,7 +178,6 @@ function build_with_data_dir() {
183
178
}
184
179
185
180
function build_without_data_dir() {
186
-
187
181
local TAG=${1}
188
182
local PULL_ENABLED=${2}
189
183
DOCKER_VERSION=" $( docker --version | grep " Docker version" | awk ' {print $3}' | sed ' s/,//' ) "
0 commit comments