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

Backport fix for all docker images showing amd64 architecture.

Browse Source 
Signed-off-by: James Blair <mail@jamesblair.net>
This commit is contained in:
James Blair
2023-04-10 22:43:10 +12:00
parent abdc3cc41f
commit 8f0a8a1271
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/build-docker.sh
View File

@@ -40,8 +40,10 @@ cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
if [ -z "$TAG" ]; then
docker build -t "gcr.io/etcd-development/etcd:${VERSION}" "${IMAGEDIR}"
docker build -t "quay.io/coreos/etcd:${VERSION}" "${IMAGEDIR}"
# Fix incorrect image "Architecture" using buildkit
# From https://stackoverflow.com/q/72144329/
DOCKER_BUILDKIT=1 docker build -t "gcr.io/etcd-development/etcd:${VERSION}" "${IMAGEDIR}"
DOCKER_BUILDKIT=1 docker build -t "quay.io/coreos/etcd:${VERSION}" "${IMAGEDIR}"
else
docker build -t "${TAG}:${VERSION}" "${IMAGEDIR}"
fi

15
scripts/test_images.sh
View File

@@ -85,3 +85,18 @@ if [ "${GET}" != "${VALUE}" ]; then
fi
echo "Succesfully tested etcd local image ${TAG}"
for TARGET_ARCH in "amd64" "arm64" "ppc64le"; do
if [ "${TARGET_ARCH}" != "amd64" ]; then
ARCH_TAG=v"${VERSION}"-"${TARGET_ARCH}"
else
ARCH_TAG=v"${VERSION}"
fi
IMG_ARCH=$(docker inspect --format '{{.Architecture}}' "${REPOSITARY}:${ARCH_TAG}")
if [ "${IMG_ARCH}" != "$TARGET_ARCH" ];then
echo "Incorrect docker image architecture"
exit 1
fi
echo "Correct Architecture ${ARCH_TAG}"
done