Skip to content
This repository has been archived by the owner on Jan 9, 2025. It is now read-only.

[rel-v3.4.18] Build Multi-Arch Images 📦 #20

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add support for ARM64
  • Loading branch information
timuthy committed Jul 5, 2022
commit ddc4aaf30d31cd6370bf0e542993e3174f31ec00
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# SPDX-FileCopyrightText: 2020 SAP SE or an SAP affiliate company and Gardener contributors
# SPDX-License-Identifier: Apache-2.0

FROM gcr.io/etcd-development/etcd:v3.4.18
FROM gcr.io/etcd-development/etcd:v3.4.18 as source-amd64
FROM gcr.io/etcd-development/etcd:v3.4.18-arm64 as source-arm64
FROM source-$TARGETARCH as source

RUN apt update
RUN apt install -y bash curl wget
Expand Down
5 changes: 4 additions & 1 deletion Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# SPDX-FileCopyrightText: 2020 SAP SE or an SAP affiliate company and Gardener contributors
# SPDX-License-Identifier: Apache-2.0

FROM gcr.io/etcd-development/etcd:ETCD_VERSION
FROM gcr.io/etcd-development/etcd:ETCD_VERSION as source-amd64
FROM gcr.io/etcd-development/etcd:ETCD_VERSION as source-arm64

FROM source-$TARGETARCH

RUN apt update
RUN apt install -y bash curl wget
Expand Down
6 changes: 6 additions & 0 deletions etcd_bootstrap_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ trap_and_propagate() {
}

start_managed_etcd(){
arch=$(uname -m)
if [ $arch = "aarch64" ] || [ $arch = "arm64" ]; then
# Running etcd on ARM has experimental support for version 3.4.x
# https://etcd.io/docs/v3.4/op-guide/supported-platform/
export ETCD_UNSUPPORTED_ARCH=arm64
fi
rm -rf $VALIDATION_MARKER
CONFIG_FILE=/etc/etcd.conf.yaml
curl "$BACKUP_ENDPOINT/config" -o $CONFIG_FILE
Expand Down