Build just one image with the correct tag instead of double the number

This commit is contained in:
Sanyam Kapoor 2018-08-07 15:28:03 -07:00
parent c86f306d79
commit e34f9aca75
2 changed files with 14 additions and 12 deletions

View File

@ -8,9 +8,14 @@
set -ex
PROJECT=${PROJECT:-}
BUILD_IMAGE_UUID=$(python3 -c 'import uuid; print(uuid.uuid4().hex[:7]);')
BUILD_IMAGE_TAG="code-search:v$(date +%Y%m%d)-${BUILD_IMAGE_UUID}"
if [[ ! -z "${PROJECT}" ]]; then
BUILD_IMAGE_TAG="gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}"
fi
# Directory of this script used for path references
_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -29,15 +34,9 @@ docker build -f "${_SCRIPT_DIR}/Dockerfile" \
"${_SCRIPT_DIR}/../.."
# Push images to GCR Project if available
PROJECT=${PROJECT:-}
if [[ ! -z "${PROJECT}" ]]; then
# Tag and push CPU image
docker tag ${BUILD_IMAGE_TAG} gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}
docker push gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}
# Tag and push GPU image
docker tag ${BUILD_IMAGE_TAG}-gpu gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}-gpu
docker push gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}-gpu
docker push ${BUILD_IMAGE_TAG}
docker push ${BUILD_IMAGE_TAG}-gpu
fi
popd

View File

@ -13,10 +13,15 @@
set -ex
PROJECT=${PROJECT:-}
BUILD_IMAGE_UUID=$(python3 -c 'import uuid; print(uuid.uuid4().hex[:7]);')
BUILD_IMAGE_TAG="code-search-ui:v$(date +%Y%m%d)-${BUILD_IMAGE_UUID}"
PUBLIC_URL=${PUBLIC_URL:-"/code-search"}
if [[ ! -z "${PROJECT}" ]]; then
BUILD_IMAGE_TAG="gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}"
fi
# Directory of this script used for path references
_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@ -27,11 +32,9 @@ docker build -f "${_SCRIPT_DIR}/Dockerfile" \
--build-arg PUBLIC_URL=${PUBLIC_URL} \
"${_SCRIPT_DIR}/../.."
# Push image to GCR PROJECT available
PROJECT=${PROJECT:-}
# Push images to GCR Project if available
if [[ ! -z "${PROJECT}" ]]; then
docker tag ${BUILD_IMAGE_TAG} gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}
docker push gcr.io/${PROJECT}/${BUILD_IMAGE_TAG}
docker push ${BUILD_IMAGE_TAG}
fi
popd