|
|
@@ -10,21 +10,20 @@ fi
|
|
|
VERSION=${1}
|
|
|
ARCH=$(go env GOARCH)
|
|
|
DOCKERFILE="Dockerfile-release"
|
|
|
-: ${TAG:="quay.io/coreos/etcd"}
|
|
|
|
|
|
-if [ -z ${BINARYDIR} ]; then
|
|
|
- RELEASE="etcd-${1}"-`go env GOOS`-`go env GOARCH`
|
|
|
+if [ -z "${BINARYDIR}" ]; then
|
|
|
+ RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH)
|
|
|
BINARYDIR="${RELEASE}"
|
|
|
TARFILE="${RELEASE}.tar.gz"
|
|
|
TARURL="https://github.com/coreos/etcd/releases/download/${1}/${TARFILE}"
|
|
|
- if ! curl -f -L -o ${TARFILE} ${TARURL} ; then
|
|
|
+ if ! curl -f -L -o "${TARFILE}" "${TARURL}" ; then
|
|
|
echo "Failed to download ${TARURL}."
|
|
|
exit 1
|
|
|
fi
|
|
|
- tar -zvxf ${TARFILE}
|
|
|
+ tar -zvxf "${TARFILE}"
|
|
|
fi
|
|
|
|
|
|
-if [ ${ARCH} != "amd64" ]; then
|
|
|
+if [ "${ARCH}" != "amd64" ]; then
|
|
|
DOCKERFILE+=".${ARCH}"
|
|
|
VERSION+="-${ARCH}"
|
|
|
fi
|
|
|
@@ -34,10 +33,15 @@ BUILDDIR=${BUILDDIR:-.}
|
|
|
|
|
|
IMAGEDIR=${BUILDDIR}/image-docker
|
|
|
|
|
|
-mkdir -p ${IMAGEDIR}/var/etcd
|
|
|
-mkdir -p ${IMAGEDIR}/var/lib/etcd
|
|
|
-cp ${BINARYDIR}/etcd ${BINARYDIR}/etcdctl ${IMAGEDIR}
|
|
|
+mkdir -p "${IMAGEDIR}"/var/etcd
|
|
|
+mkdir -p "${IMAGEDIR}"/var/lib/etcd
|
|
|
+cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
|
|
|
|
|
|
-cat ./${DOCKERFILE} > ${IMAGEDIR}/Dockerfile
|
|
|
+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
|