Skip to content

Commit 14e6a66

Browse files
committed
[CI] Updates make.sh, wrap docker run values in quotes
1 parent 7df0cfb commit 14e6a66

File tree

1 file changed

+7
-15
lines changed

1 file changed

+7
-15
lines changed

.ci/make.sh

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#!/usr/bin/env bash
2-
32
# ------------------------------------------------------- #
43
#
5-
# Skeleton for common build entry script for all elastic
6-
# clients. Needs to be adapted to individual client usage.
4+
# Build entry script for elasticsearch-ruby
75
#
86
# Must be called: ./.ci/make.sh <target> <params>
97
#
@@ -23,11 +21,9 @@
2321
# ------------------------------------------------------- #
2422
# Bootstrap
2523
# ------------------------------------------------------- #
26-
2724
script_path=$(dirname "$(realpath -s "$0")")
2825
repo=$(realpath "$script_path/../")
2926

30-
3127
# shellcheck disable=SC1090
3228
CMD=$1
3329
TASK=$1
@@ -41,13 +37,13 @@ output_folder=".ci/output"
4137
codegen_folder=".ci/output"
4238
OUTPUT_DIR="$repo/${output_folder}"
4339
REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
40+
RUBY_TEST_VERSION=${RUBY_TEST_VERSION-2.7}
4441
mkdir -p "$OUTPUT_DIR"
4542

4643
echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
4744
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
4845
echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"
49-
50-
RUBY_TEST_VERSION=${RUBY_TEST_VERSION-2.7}
46+
echo -e "\033[34;1mINFO:\033[0m RUBY_TEST_VERSION ${RUBY_TEST_VERSION}\033[0m"
5147

5248
case $CMD in
5349
clean)
@@ -112,17 +108,13 @@ case $CMD in
112108
exit 1
113109
esac
114110

115-
echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"
116-
echo -e "\033[34;1mINFO:\033[0m RUBY_TEST_VERSION ${RUBY_TEST_VERSION}\033[0m"
117-
118111
echo -e "\033[1m>>>>> Build [elastic/elasticsearch-ruby container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
119112

120113
# ------------------------------------------------------- #
121114
# Build Container
122115
# ------------------------------------------------------- #
123116

124117
echo -e "\033[34;1mINFO: building $product container\033[0m"
125-
126118
docker build --file .ci/Dockerfile --tag ${product} .
127119

128120
# ------------------------------------------------------- #
@@ -140,11 +132,11 @@ args_string="${args_string// /,}"
140132
docker run \
141133
--env "RUBY_TEST_VERSION=${RUBY_TEST_VERSION}" \
142134
--name test-runner \
143-
--volume $REPO_BINDING \
144-
--volume $repo:/usr/src/app \
135+
--volume "${REPO_BINDING}" \
136+
--volume "${repo}:/usr/src/app" \
145137
--rm \
146-
$product \
147-
bundle exec rake unified_release:"$TASK"["$args_string"]
138+
"${product}" \
139+
bundle exec rake unified_release:${TASK}["${args_string}"]
148140

149141
# ------------------------------------------------------- #
150142
# Post Command tasks & checks

0 commit comments

Comments
 (0)