Further improve settings for extra tests from GitLab

tests/gitlab.yml

@@ -25,54 +25,34 @@ Code Quality:
     CODE_QUALITY_IMAGE: registry.lakedrops.com/docker/code-climate-drupal/code-climate-drupal
     REPORT_FORMAT: html
   script:
-    - |
-      export SOURCE_CODE=$(php /usr/local/bin/volume.php /code) | cut -d: -f1
-    - |
-      if ! docker info &>/dev/null; then
-        if [ -z "$DOCKER_HOST" -a "$KUBERNETES_PORT" ]; then
-          export DOCKER_HOST='tcp://localhost:2375'
-        fi
-      fi
-    - | # this is required to avoid undesirable reset of Docker image ENV variables being set on build stage
-      function propagate_env_vars() {
-        CURRENT_ENV=$(printenv)
-
-        for VAR_NAME; do
-          echo $CURRENT_ENV | grep "${VAR_NAME}=" > /dev/null && echo "--env $VAR_NAME "
-        done
-      }
     - docker pull --quiet "$CODE_QUALITY_IMAGE"
     - |
       echo docker run --rm \
-        $(propagate_env_vars \
-          SOURCE_CODE \
-          TIMEOUT_SECONDS \
-          CODECLIMATE_DEBUG \
-          CODECLIMATE_DEV \
-          REPORT_STDOUT \
-          REPORT_FORMAT \
-          ENGINE_MEMORY_LIMIT_BYTES \
-          CODECLIMATE_PREFIX \
-        ) \
+        --env REPORT_FORMAT="${REPORT_FORMAT}" \
+        --env SOURCE_CODE="$(php /usr/local/bin/volume.php /code | cut -d: -f1)" \
+        --env TIMEOUT_SECONDS="${TIMEOUT_SECONDS}" \
+        --env CODECLIMATE_DEBUG="${CODECLIMATE_DEBUG}" \
+        --env CODECLIMATE_DEV="${CODECLIMATE_DEV}" \
+        --env REPORT_FORMAT="${REPORT_FORMAT}" \
+        --env ENGINE_MEMORY_LIMIT_BYTES="${ENGINE_MEMORY_LIMIT_BYTES}" \
+        --env CODECLIMATE_PREFIX="${CODECLIMATE_PREFIX}" \
         --volume "$(php /usr/local/bin/volume.php /code)" \
         --volume /var/run/docker.sock:/var/run/docker.sock \
         "$CODE_QUALITY_IMAGE" /code
     - |
       docker run --rm \
-        $(propagate_env_vars \
-          SOURCE_CODE \
-          TIMEOUT_SECONDS \
-          CODECLIMATE_DEBUG \
-          CODECLIMATE_DEV \
-          REPORT_STDOUT \
-          REPORT_FORMAT \
-          ENGINE_MEMORY_LIMIT_BYTES \
-          CODECLIMATE_PREFIX \
-        ) \
+        --env REPORT_FORMAT="${REPORT_FORMAT}" \
+        --env SOURCE_CODE="$(php /usr/local/bin/volume.php /code | cut -d: -f1)" \
+        --env TIMEOUT_SECONDS="${TIMEOUT_SECONDS}" \
+        --env CODECLIMATE_DEBUG="${CODECLIMATE_DEBUG}" \
+        --env CODECLIMATE_DEV="${CODECLIMATE_DEV}" \
+        --env REPORT_FORMAT="${REPORT_FORMAT}" \
+        --env ENGINE_MEMORY_LIMIT_BYTES="${ENGINE_MEMORY_LIMIT_BYTES}" \
+        --env CODECLIMATE_PREFIX="${CODECLIMATE_PREFIX}" \
         --volume "$(php /usr/local/bin/volume.php /code)" \
         --volume /var/run/docker.sock:/var/run/docker.sock \
         "$CODE_QUALITY_IMAGE" /code
-      - ls -lisa
+    - ls -lisa
   artifacts:
     name: code-quality
     paths: ['gl-code-quality-report.json']