[gjs/wip/ptomato/fix-docker] WIP - CI: quote variables
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/wip/ptomato/fix-docker] WIP - CI: quote variables
- Date: Sat, 21 Sep 2019 19:48:16 +0000 (UTC)
commit 18a60272813808029d48e7e2f04ee259abbe1803
Author: Philip Chimento <philip chimento gmail com>
Date: Sat Sep 21 12:38:02 2019 -0700
WIP - CI: quote variables
.gitlab-ci.yml | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 482f2056..4b656aa1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -373,19 +373,34 @@ zeal_11:
- *CI_header
# Where the real magic happens
- - docker run --name $NAME -v $(pwd):/on-host \
- -e OS=$IMAGE -e BUILD_OPTS=$BUILD_OPTS -e CC=gcc -e MOZJS_BRANCH=$MOZJS_BRANCH $IMAGE \
- bash -e -c "cd /on-host && test/ci-images.sh"
- - docker commit $NAME "$CI_REGISTRY_IMAGE:$NAME"
+ - set +x
+ - echo "$(pwd)"
+ - echo "$NAME"
+ - echo "$IMAGE"
+ - echo "$BUILD_OPTS"
+ - echo "$MOZJS_BRANCH"
+ - echo docker run --name "$NAME" -v "$(pwd):/on-host" \
+ -e OS="$IMAGE" \
+ -e BUILD_OPTS="$BUILD_OPTS" \
+ -e CC=gcc \
+ -e MOZJS_BRANCH="$MOZJS_BRANCH"
+ "$IMAGE" bash -e -c "cd /on-host && test/ci-images.sh"
+ - docker run --name "$NAME" -v "$(pwd):/on-host" \
+ -e OS="$IMAGE" \
+ -e BUILD_OPTS="$BUILD_OPTS" \
+ -e CC=gcc \
+ -e MOZJS_BRANCH="$MOZJS_BRANCH"
+ "$IMAGE" bash -e -c "cd /on-host && test/ci-images.sh"
+ - docker commit "$NAME" "$CI_REGISTRY_IMAGE:$NAME"
# Prepare to publish
- - docker tag "$CI_REGISTRY_IMAGE:$NAME" "$CI_REGISTRY_IMAGE:job-"$CI_JOB_ID"_$NAME"
+ - docker tag "$CI_REGISTRY_IMAGE:$NAME" "$CI_REGISTRY_IMAGE:job-${CI_JOB_ID}_$NAME"
- docker images
- - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
+ - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
# Publish (if running on a schedule)
- |
- if [[ "${CI_PIPELINE_SOURCE}" == "schedule" ]]; then
+ if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then
docker push "$CI_REGISTRY_IMAGE"
fi
@@ -398,11 +413,11 @@ alpine.cpplint:
# Overrides the script from create_docker_image above
- *CI_header
- docker build -f test/extra/Dockerfile.alpine.cpplint -t "$CI_REGISTRY_IMAGE:alpine.cpplint" .
- - docker tag "$CI_REGISTRY_IMAGE:alpine.cpplint" "$CI_REGISTRY_IMAGE:job-"$CI_JOB_ID"_alpine.cpplint"
+ - docker tag "$CI_REGISTRY_IMAGE:alpine.cpplint" "$CI_REGISTRY_IMAGE:job-${CI_JOB_ID}_alpine.cpplint"
- docker images
- - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}
+ - docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
- |
- if [[ "${CI_PIPELINE_SOURCE}" == "schedule" ]]; then
+ if [[ "$CI_PIPELINE_SOURCE" == "schedule" ]]; then
docker push "$CI_REGISTRY_IMAGE"
fi
- *CI_footer
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]