From 62357bd767194597e07b0327bf02804ed9bb9143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Wed, 20 Jul 2016 01:10:49 +0300 Subject: [PATCH] Bump etcd version to 3.0.3 --- cluster/images/etcd/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 06311e110d0..9325e691acc 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -17,10 +17,10 @@ # Usage: # [TAG=2.2.1] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) -TAG?=2.2.5 +TAG?=3.0.3 ARCH?=amd64 REGISTRY?=gcr.io/google_containers -GOLANG_VERSION?=1.6.0 +GOLANG_VERSION?=1.6.3 GOARM=6 TEMP_DIR:=$(shell mktemp -d) @@ -49,10 +49,17 @@ else # Download etcd in a golang container and cross-compile it statically docker run -it -v $(TEMP_DIR):/etcdbin golang:$(GOLANG_VERSION) /bin/bash -c \ - "git clone https://github.com/coreos/etcd \ - && cd etcd && git checkout v$(TAG) \ + "git clone https://github.com/coreos/etcd /go/src/github.com/coreos/etcd \ + && cd /go/src/github.com/coreos/etcd \ + && git checkout v$(TAG) \ && GOARM=$(GOARM) GOARCH=$(ARCH) ./build \ - && cp bin/* /etcdbin" + && cp bin/$(ARCH)/* /etcdbin" + + # Add this ENV variable in order to workaround an unsupported arch blocker + # The multiarch feature is in an limited and experimental state right now, and etcd should work fine on arm64 + # On arm (which is 32-bit), it can't handle >1GB data in-memory, but it is very unlikely someone tinkering with their limited arm devices would reach such a high usage + # ppc64le is still quite untested, but compiles and is probably in the process of being validated by IBM. + cd $(TEMP_DIR) && echo "ENV ETCD_UNSUPPORTED_ARCH=$(ARCH)" >> Dockerfile endif # Replace BASEIMAGE with the real base image