From a06e6bbb37e0a20ef35d78d64e145f891db1cb15 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 12 Apr 2017 17:04:57 +0100 Subject: [PATCH] build: Switch using go-compile from linuxkit hub org Signed-off-by: Rolf Neugebauer --- Makefile | 2 +- pkg/binfmt/Makefile | 4 ++-- pkg/metadata/Makefile | 2 +- pkg/sysctl/Makefile | 2 +- pkg/sysfs/Makefile | 2 +- test/virtsock/Dockerfile.build | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c04b13c50..2e1aa75c3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: default VERSION="0.0" # dummy for now GIT_COMMIT=$(shell git rev-list -1 HEAD) -GO_COMPILE=mobylinux/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:188beb574d4702a92fa3396a57cabaade28003c82f9413c3121a370ff8becea4 +GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 MOBY?=bin/moby GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]') diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile index 86e936cbb..a8c469e45 100644 --- a/pkg/binfmt/Makefile +++ b/pkg/binfmt/Makefile @@ -2,7 +2,7 @@ QEMU_IMAGE=mobylinux/qemu-user-static:da39a3ee5e6b4b0d3255bfef95601890afd80709@s QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES)) -GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a +GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 BINFMT_BINARY=usr/bin/binfmt @@ -20,7 +20,7 @@ $(QEMU_BINARIES): $(BINFMT_BINARY): main.go mkdir -p $(dir $@) tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(GO_COMPILE) -o $@ | tar xf - - + DIRS=dev proc sys $(DIRS): mkdir -p $@ diff --git a/pkg/metadata/Makefile b/pkg/metadata/Makefile index 2de6f1b83..3fcabf9bc 100644 --- a/pkg/metadata/Makefile +++ b/pkg/metadata/Makefile @@ -1,4 +1,4 @@ -GO_COMPILE=mobylinux/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:188beb574d4702a92fa3396a57cabaade28003c82f9413c3121a370ff8becea4 +GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 diff --git a/pkg/sysctl/Makefile b/pkg/sysctl/Makefile index 9dc6ce298..61790f1ec 100644 --- a/pkg/sysctl/Makefile +++ b/pkg/sysctl/Makefile @@ -1,4 +1,4 @@ -GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a +GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 diff --git a/pkg/sysfs/Makefile b/pkg/sysfs/Makefile index d3f3d804f..a0db5110b 100644 --- a/pkg/sysfs/Makefile +++ b/pkg/sysfs/Makefile @@ -1,4 +1,4 @@ -GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a +GO_COMPILE=linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 diff --git a/test/virtsock/Dockerfile.build b/test/virtsock/Dockerfile.build index 8f472d8f6..f128f79ed 100644 --- a/test/virtsock/Dockerfile.build +++ b/test/virtsock/Dockerfile.build @@ -1,4 +1,4 @@ -FROM mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9 +FROM linuxkit/go-compile:90607983001c2789911afabf420394d51f78ced8@sha256:8b6566c6fd9f3bca31191b919449248d3cb1ca3a562276fca7199e93451d6596 ENV VIRTSOCK_COMMIT=6b4dec728264e07c41e108caebd6bc2b72559a5f RUN mkdir -p $GOPATH/src/github.com/rneugeba && \