Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Generate and push multi-arch docker manifest list

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Dockerfile-release → Dockerfile-release.amd64
View File

9
scripts/build-docker
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:-.}

32
scripts/release
View File

@ -35,6 +35,9 @@ main() {
BRANCH=${BRANCH:-"release-${MINOR_VERSION}"}
REPOSITORY=${REPOSITORY:-"https://github.com/etcd-io/etcd"}
# Required to enable 'docker manifest ...'
export DOCKER_CLI_EXPERIMENTAL=enabled
if ! command -v docker >/dev/null; then
echo "cannot find docker"
exit 1
@ -191,20 +194,29 @@ main() {
done
gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
echo "Pushing container images to quay.io ${RELEASE_VERSION}"
docker push "quay.io/coreos/etcd:${RELEASE_VERSION}"
# NB: `docker manifest create` insists on at least one manifest.
# We overwrite it later with --amend anyway.
docker manifest create "quay.io/coreos/etcd:${RELEASE_VERSION}" "quay.io/coreos/etcd:${RELEASE_VERSION}-amd64"
docker manifest create "gcr.io/etcd-development/etcd:${RELEASE_VERSION}" "gcr.io/etcd-development/etcd:${RELEASE_VERSION}-amd64"
echo "Pushing container images to gcr.io ${RELEASE_VERSION}"
gcloud docker -- push "gcr.io/etcd-development/etcd:${RELEASE_VERSION}"
for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
echo "Pushing container images to quay.io ${RELEASE_VERSION}-${TARGET_ARCH}"
docker push "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
docker manifest create --amend "quay.io/coreos/etcd:${RELEASE_VERSION}" "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
docker manifest annotate "quay.io/coreos/etcd:${RELEASE_VERSION}" "quay.io/coreos/etcd:${RELEASE_VERSION}-${TARGET_ARCH}" --arch "${TARGET_ARCH}"
for TARGET_ARCH in "-arm64" "-ppc64le" "-s390x"; do
echo "Pushing container images to quay.io ${RELEASE_VERSION}${TARGET_ARCH}"
docker push "quay.io/coreos/etcd:${RELEASE_VERSION}${TARGET_ARCH}"
echo "Pushing container images to gcr.io ${RELEASE_VERSION}${TARGET_ARCH}"
gcloud docker -- push "gcr.io/etcd-development/etcd:${RELEASE_VERSION}${TARGET_ARCH}"
echo "Pushing container images to gcr.io ${RELEASE_VERSION}-${TARGET_ARCH}"
gcloud docker -- push "gcr.io/etcd-development/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
docker manifest create --amend "gcr.io/etcd-development/etcd:${RELEASE_VERSION}" "gcr.io/etcd-development/etcd:${RELEASE_VERSION}-${TARGET_ARCH}"
docker manifest annotate "gcr.io/etcd-development/etcd:${RELEASE_VERSION}" "gcr.io/etcd-development/etcd:${RELEASE_VERSION}-${TARGET_ARCH}" --arch "${TARGET_ARCH}"
done
echo "Pushing container manifest list to quay.io ${RELEASE_VERSION}"
docker manifest push "quay.io/coreos/etcd:${RELEASE_VERSION}"
echo "Pushing container manifest list to gcr.io ${RELEASE_VERSION}"
gcloud docker -- manifest push "gcr.io/etcd-development/etcd:${RELEASE_VERSION}"
echo "Setting permissions using gsutil..."
gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com
fi