diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-11-27 14:22:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-11-27 14:22:53 +0000 |
| commit | ec0efb4ade14f268bedcd9f74b9823253324d41b (patch) | |
| tree | f526ec9e4125d5e7d089a5f8a168ea249f808e9c /ci/build.sh | |
| parent | f7ce946f865fa4172748d85a335a811e6546355d (diff) | |
| parent | f03a33bc58135acc7e4420efaaf34c26a32d6142 (diff) | |
Merge "[docker] build: Allow cache invalidation"
Diffstat (limited to 'ci/build.sh')
| -rwxr-xr-x | ci/build.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ci/build.sh b/ci/build.sh index 67b6d46d8..108ce139a 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -32,12 +32,14 @@ DEPLOY_DIR=$(cd "${MCP_REPO_ROOT_PATH}/mcp/scripts"; pwd) DOCKER_DIR=$(cd "${MCP_REPO_ROOT_PATH}/docker"; pwd) DOCKER_TAG=${1:-latest} DOCKER_PUSH=${2---push} # pass an empty second arg to disable push +CACHE_INVALIDATE=${CACHE_INVALIDATE:-0} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" source "${DEPLOY_DIR}/lib_jump_common.sh" [ ! "${TERM:-unknown}" = 'unknown' ] || export TERM=vt220 +[ "${CACHE_INVALIDATE}" = 0 ] || CACHE_INVALIDATE=$(date +%s) # # END of variables to customize @@ -69,11 +71,10 @@ docker_install popd > /dev/null pushd "${DOCKER_DIR}" > /dev/null -python -m pipenv --two -env VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install -env VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install invoke +env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python -m pipenv --two install +env PIPENV_HIDE_EMOJIS=1 VIRTUALENV_ALWAYS_COPY=1 python -m pipenv install invoke # shellcheck disable=SC2086 -python -m pipenv run \ +env PIPENV_HIDE_EMOJIS=1 python -m pipenv run \ invoke build saltmaster-reclass \ --require 'salt salt-formulas opnfv reclass tini-saltmaster' \ --dist=ubuntu \ @@ -81,6 +82,8 @@ python -m pipenv run \ --formula-rev=nightly \ --opnfv-tag="${DOCKER_TAG}" \ --salt='stable 2017.7' \ + --build-arg-extra " \ + CACHE_INVALIDATE=\"${CACHE_INVALIDATE}\"" \ ${DOCKER_PUSH} popd > /dev/null |