[gjs/wip/ptomato/fix-docker] WIP - CI: quote variables



commit a8993a6018a5e285ed8f7fab3c0e99bf4a3ac365
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Sep 21 12:38:02 2019 -0700

    WIP - CI: quote variables

 .gitlab-ci.yml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 482f2056..e400818e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -373,19 +373,27 @@ 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"
+    - echo "$(pwd)"
+    - echo "$NAME"
+    - echo "$IMAGE"
+    - echo "$BUILD_OPTS"
+    - echo "$MOZJS_BRANCH"
+    - 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 +406,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]