Generate and push multi-arch docker manifest list

Change amd64 docker image to use a `-amd64` suffix, consistent with
other architectures.  Introduce a multiarch docker manifest list with
the original (no-arch) docker tag.

Fixes #10380
This commit is contained in:
Angus Lees
2021-01-19 11:52:15 +11:00
parent bb71f706a6
commit 7f79ffb409
3 changed files with 24 additions and 17 deletions

View File

@@ -7,9 +7,9 @@ if [ "$#" -ne 1 ]; then
exit 1
fi
VERSION=${1}
ARCH=$(go env GOARCH)
DOCKERFILE="Dockerfile-release"
VERSION="${1}-${ARCH}"
DOCKERFILE="Dockerfile-release.${ARCH}"
if [ -z "${BINARYDIR}" ]; then
RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH)
@@ -23,11 +23,6 @@ if [ -z "${BINARYDIR}" ]; then
tar -zvxf "${TARFILE}"
fi
if [ "${ARCH}" != "amd64" ]; then
DOCKERFILE+=".${ARCH}"
VERSION+="-${ARCH}"
fi
BINARYDIR=${BINARYDIR:-.}
BUILDDIR=${BUILDDIR:-.}