Skip to content

Commit

Permalink
Download arm64 binary from Ubuntu repo
Browse files Browse the repository at this point in the history
  • Loading branch information
bboreham committed Apr 3, 2017
1 parent 916ff7a commit 25b63e5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 deletions.
20 changes: 13 additions & 7 deletions Makefile
Expand Up @@ -130,7 +130,7 @@ PUSH_ML=push_ml_weave push_ml_weaveexec push_ml_plugin push_ml_weave-kube push_m
WEAVE_EXPORT=weave$(ARCH_EXT).tar.gz

DOCKER_VERSION=1.10.3
DOCKER_DISTRIB=prog/weaveexec/docker-$(DOCKER_VERSION).tgz
DOCKER_BINARY=prog/weaveexec/docker
DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/$(WEAVEEXEC_DOCKER_ARCH)/docker-$(DOCKER_VERSION).tgz
NETGO_CHECK=@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
rm $@; \
Expand Down Expand Up @@ -251,15 +251,14 @@ $(WEAVER_UPTODATE): prog/weaver/Dockerfile.$(DOCKERHUB_USER) $(WEAVER_EXE) $(WEA
$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker build -f prog/weaver/Dockerfile.$(DOCKERHUB_USER) -t $(WEAVER_IMAGE) prog/weaver
touch $@

$(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) prog/weaveexec/symlink $(DOCKER_DISTRIB) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) $(WEAVEWAIT_NOOP_EXE) $(WEAVEWAIT_NOMCAST_EXE) $(WEAVEUTIL_EXE)
$(WEAVEEXEC_UPTODATE): prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) prog/weaveexec/symlink $(DOCKER_BINARY) weave $(SIGPROXY_EXE) $(WEAVEPROXY_EXE) $(WEAVEWAIT_EXE) $(WEAVEWAIT_NOOP_EXE) $(WEAVEWAIT_NOMCAST_EXE) $(WEAVEUTIL_EXE)
cp weave prog/weaveexec/weave
cp $(SIGPROXY_EXE) prog/weaveexec/sigproxy
cp $(WEAVEPROXY_EXE) prog/weaveexec/weaveproxy
cp $(WEAVEWAIT_EXE) prog/weaveexec/weavewait
cp $(WEAVEWAIT_NOOP_EXE) prog/weaveexec/weavewait_noop
cp $(WEAVEWAIT_NOMCAST_EXE) prog/weaveexec/weavewait_nomcast
cp $(WEAVEUTIL_EXE) prog/weaveexec/weaveutil
tar -xf $(DOCKER_DISTRIB) usr/local/bin/docker -O > prog/weaveexec/docker
chmod +x prog/weaveexec/docker
$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker build -f prog/weaveexec/Dockerfile.$(DOCKERHUB_USER) -t $(WEAVEEXEC_IMAGE) prog/weaveexec
touch $@
Expand All @@ -284,9 +283,16 @@ $(WEAVEDB_UPTODATE): prog/weavedb/Dockerfile
$(WEAVE_EXPORT): $(IMAGES_UPTODATE) $(WEAVEDB_UPTODATE)
$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker save $(addsuffix :latest,$(IMAGES)) | gzip > $@

$(DOCKER_DISTRIB):
curl -o $(DOCKER_DISTRIB) $(DOCKER_DISTRIB_URL)
cd $(shell dirname $@) && sha256sum -c $(shell pwd)/build/shasums/docker-tgz-$(WEAVEEXEC_DOCKER_ARCH).sha256sum
$(DOCKER_BINARY):
ifeq ($(ARCH),arm64)
curl -o /tmp/docker.deb https://launchpad.net/ubuntu/+archive/primary/+files/docker.io_$(DOCKER_VERSION)-0ubuntu6_$(ARCH).deb
cd /tmp; ar x docker.deb data.tar.xz
tar -xf /tmp/data.tar.xz ./usr/bin/docker -O > $(DOCKER_BINARY)
else
curl -o /tmp/docker.tgz $(DOCKER_DISTRIB_URL)
tar -xf /tmp/docker.tgz usr/local/bin/docker -O > $(DOCKER_BINARY)
endif
cd $(shell dirname $@) && sha256sum -c $(shell pwd)/build/shasums/docker-$(WEAVEEXEC_DOCKER_ARCH).sha256sum

tools/.git $(MANIFEST_TOOL_DIR)/.git:
git submodule update --init
Expand Down Expand Up @@ -349,7 +355,7 @@ clean-bin:
-$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker rmi $(IMAGES)
find prog -type f -name "Dockerfile.*" -not -name "Dockerfile.template" -print | xargs rm -f
find prog -type f -name "*qemu-*" -print | xargs rm -f
rm -rf $(EXES) $(IMAGES_UPTODATE) $(WEAVEDB_UPTODATE) weave*.tar.gz $(DOCKER_DISTRIB) prog/weaveexec/docker .pkg
rm -rf $(EXES) $(IMAGES_UPTODATE) $(WEAVEDB_UPTODATE) weave*.tar.gz $(DOCKER_BINARY) prog/weaveexec/docker .pkg

clean: clean-bin
-$(SUDO) DOCKER_HOST=$(DOCKER_HOST) docker rmi $(BUILD_IMAGE)
Expand Down
1 change: 0 additions & 1 deletion build/shasums/docker-tgz-armel.sha256sum

This file was deleted.

1 change: 0 additions & 1 deletion build/shasums/docker-tgz-x86_64.sha256sum

This file was deleted.

1 change: 1 addition & 0 deletions build/shasums/docker-x86_64.sha256sum
@@ -0,0 +1 @@
d0df512afa109006a450f41873634951e19ddabf8c7bd419caeb5a526032d86d docker

0 comments on commit 25b63e5

Please sign in to comment.