Skip to content
Snippets Groups Projects
Commit 4803d4d0 authored by Dmitry Kalinkin's avatar Dmitry Kalinkin Committed by Dmitry Kalinkin
Browse files

Revert "fix: remove --no-cache again"

This reverts commit 8c4e2e17.
parent aaf61cd5
No related tags found
1 merge request!935Revert "fix: remove --no-cache again"
...@@ -32,7 +32,7 @@ variables: ...@@ -32,7 +32,7 @@ variables:
NIGHTLY_TAG: "nightly" NIGHTLY_TAG: "nightly"
## Additional options for docker build (e.g. --no-cache) ## Additional options for docker build (e.g. --no-cache)
BUILD_OPTIONS: "" BUILD_OPTIONS: "--no-cache"
## Version to be set by external trigger ## Version to be set by external trigger
VERSION: "" VERSION: ""
...@@ -268,8 +268,7 @@ base: ...@@ -268,8 +268,7 @@ base:
needs: needs:
- version - version
script: script:
- while ! - docker buildx build --push ${BUILD_OPTIONS}
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG} --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${INTERNAL_TAG}
${EXPORT_TAG:+ ${EXPORT_TAG:+
${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}} ${CI_PUSH:+--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}:${EXPORT_TAG}}
...@@ -283,13 +282,6 @@ base: ...@@ -283,13 +282,6 @@ base:
--provenance false --provenance false
containers/debian containers/debian
2>&1 | tee build.log 2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
fi
done
eic: eic:
...@@ -352,8 +344,7 @@ eic: ...@@ -352,8 +344,7 @@ eic:
source eic-spack.sh ; source eic-spack.sh ;
export SPACK_VERSION ; export SPACK_VERSION ;
cat mirrors.yaml.in | envsubst > mirrors.yaml cat mirrors.yaml.in | envsubst > mirrors.yaml
- while ! - docker buildx build --push ${BUILD_OPTIONS}
docker buildx build --push ${BUILD_OPTIONS}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE} --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
--tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE} --tag ${CI_REGISTRY}/${CI_PROJECT_PATH}/${BUILD_IMAGE/eic/jug}${ENV}:${INTERNAL_TAG}-${BUILD_TYPE}
${EXPORT_TAG:+ ${EXPORT_TAG:+
...@@ -424,13 +415,7 @@ eic: ...@@ -424,13 +415,7 @@ eic:
--provenance false --provenance false
containers/jug containers/jug
2>&1 | tee build.log 2>&1 | tee build.log
; do
if grep "unknown blob" build.log ; then
BUILD_OPTIONS="--no-cache ${BUILD_OPTIONS}" ;
else
exit 1 ;
fi
done
.singularity: .singularity:
image: image:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment