diff options
| author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 14:29:11 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-07-26 14:31:26 +0200 |
| commit | 12489cb6196a15fde9c75c2acfe5874ac6f457d7 (patch) | |
| tree | 581d912de75a07a7a557185939cfae399cf6fe52 /docker | |
| parent | cebd669302e89ea1b7efca9c94dc1854f17a68a8 (diff) | |
Wrap paths in quotes
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/ci/vespa-ci-internal.sh | 8 | ||||
| -rwxr-xr-x | docker/vespa-ci.sh | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/ci/vespa-ci-internal.sh b/docker/ci/vespa-ci-internal.sh index e15dcec8555..eadb9e97318 100755 --- a/docker/ci/vespa-ci-internal.sh +++ b/docker/ci/vespa-ci-internal.sh @@ -18,13 +18,13 @@ mkdir "${SOURCE_DIR}" mkdir "${BUILD_DIR}" mkdir "${LOG_DIR}" -git clone --no-checkout --no-hardlinks file://${MAPPED_DIR} "${SOURCE_DIR}" +git clone --no-checkout --no-hardlinks "file://${MAPPED_DIR}" "${SOURCE_DIR}" cd "${SOURCE_DIR}" git -c advice.detachedHead=false checkout ${GIT_COMMIT} NUM_THREADS=$(($(nproc --all) * 2)) -bash ${MAPPED_DIR}/docker/ci/build-and-test.sh ${SOURCE_DIR} ${BUILD_DIR} ${LOG_DIR} ${NUM_THREADS} +bash "${MAPPED_DIR}/docker/ci/build-and-test.sh" "${SOURCE_DIR}" "${BUILD_DIR}" "${LOG_DIR}" ${NUM_THREADS} TIMESTAMP=$(date +%Y-%m-%dT%H:%M:%S) -sudo cp ${LOG_DIR}/java.log ${MAPPED_DIR}/docker/logs/vespa-ci-java-${TIMESTAMP}.log -sudo cp ${LOG_DIR}/cpp.log ${MAPPED_DIR}/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log +sudo cp "${LOG_DIR}/java.log" "${MAPPED_DIR}/docker/logs/vespa-ci-java-${TIMESTAMP}.log" +sudo cp "${LOG_DIR}/cpp.log" "${MAPPED_DIR}/docker/logs/vespa-ci-cpp-${TIMESTAMP}.log" diff --git a/docker/vespa-ci.sh b/docker/vespa-ci.sh index c9fefe96a21..2e48b737ff7 100755 --- a/docker/vespa-ci.sh +++ b/docker/vespa-ci.sh @@ -10,7 +10,7 @@ fi RELATIVE_DIR=$(dirname "${BASH_SOURCE[0]}") DIR=$(cd "${RELATIVE_DIR}" && pwd) -cd $DIR +cd "${DIR}" GIT_COMMIT=$1 DOCKER_IMAGE="vespaengine/vespa-dev:latest" @@ -18,7 +18,7 @@ INTERNAL_DIR=/vespa mkdir -p logs -docker run --rm -v ${DIR}/..:${INTERNAL_DIR} --entrypoint ${INTERNAL_DIR}/docker/ci/vespa-ci-internal.sh "$DOCKER_IMAGE" "$GIT_COMMIT" \ +docker run --rm -v ${DIR}/..:${INTERNAL_DIR} --entrypoint "${INTERNAL_DIR}/docker/ci/vespa-ci-internal.sh" "$DOCKER_IMAGE" "$GIT_COMMIT" \ 2>&1 | tee logs/vespa-ci-$(date +%Y-%m-%dT%H:%M:%S).log # Needed because of piping docker run to tee above |