[docker] Relax verify check for docker pull

JIRA: FUEL-383

Change-Id: I9203aa8d20def5b78d261f8c6847ddc576f0feb7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/ci/build.sh b/ci/build.sh
index fde0cfe..f15c529 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -71,6 +71,7 @@ pushd "${DOCKER_DIR}" > /dev/null
 pipenv --two
 pipenv install
 pipenv install invoke
+# shellcheck disable=SC2086
 pipenv run \
   invoke build saltmaster-reclass \
     --require 'salt salt-formulas opnfv reclass tini-saltmaster' \
@@ -79,7 +80,7 @@ pipenv run \
     --formula-rev=nightly \
     --opnfv-tag="${DOCKER_TAG}" \
     --salt='stable 2017.7' \
-    "${DOCKER_PUSH}"
+    ${DOCKER_PUSH}
 
 popd > /dev/null
 

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 34229df..df35f37 100644 (file)
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -497,7 +497,7 @@ function prepare_containers {
   docker-compose --version > /dev/null 2>&1 || COMPOSE_PREFIX="${image_dir}/"
 
   "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml down
-  if [ ! "${MCP_DOCKER_TAG}" = 'verify' ]; then
+  if [[ ! "${MCP_DOCKER_TAG}" =~ 'verify' ]]; then
     "${COMPOSE_PREFIX}docker-compose" -f docker-compose/docker-compose.yaml pull
   fi
   sudo rm -rf "${image_dir}/"{salt,hosts,pki} "${image_dir}/nodes/"*