diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68268a0419746fd1705e6bbca4c2e08f5641f8c9..690783884fe50ae5b4c72e2a2c123833654f29fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,7 +179,7 @@ jug_dev:default: - cp -r spack containers/jug - cp -r spack.yaml containers/jug/spack/spack.yaml ## Optionally build the raw builder image - - [ ${EXPORT_BUILDER} = 1 ] && docker build + - test ${EXPORT_BUILDER} = 1 && docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:builder-${INTERNAL_TAG} --target=builder -f containers/jug/dev.Dockerfile @@ -197,7 +197,7 @@ jug_dev:default: --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) containers/jug ## push builder image do DH if desired - - [ ${EXPORT_BUILDER} = 1 ] && ./gitlab-ci/docker_push.sh + - test ${EXPORT_BUILDER} = 1 && ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l builder-${INTERNAL_TAG} -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME} builder-${EXPORT_TAG} --dockerhub