Merge pull request #8932 from gyuho/release-gcr

scripts/build-docker: build both gcr.io and quay.io images
This commit is contained in:
Gyuho Lee 2017-11-28 15:10:13 -08:00 committed by GitHub
commit 614ef75c01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,7 +10,6 @@ fi
VERSION=${1}
ARCH=$(go env GOARCH)
DOCKERFILE="Dockerfile-release"
if [ -z "$TAG" ]; then TAG="quay.io/coreos/etcd"; fi
if [ -z "${BINARYDIR}" ]; then
RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH)
@ -40,4 +39,9 @@ cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}"
if [ -z "$TAG" ]; then
docker build -t "gcr.io/etcd-development/etcd:${VERSION}" "${IMAGEDIR}"
docker build -t "quay.io/coreos/etcd:${VERSION}" "${IMAGEDIR}"
else
docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}"
fi