diff --git a/Makefile b/Makefile index 657d3d145..cdb46659d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ default: bin/moby moby-initrd.img all: default -GO_COMPILE=mobylinux/go-compile:236629d9fc0779db9e7573ceb8b0e92f08f553be@sha256:16020c2d90cecb1f1d2d731187e947535c23f38b62319dd386ae642b4b32e1fb +GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a MOBY_DEPS=$(wildcard *.go) pkg vendor GOOS=$(shell uname -s | tr '[:upper:]' '[:lower:]') diff --git a/base/binfmt/Makefile b/base/binfmt/Makefile index 200297090..86e936cbb 100644 --- a/base/binfmt/Makefile +++ b/base/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:236629d9fc0779db9e7573ceb8b0e92f08f553be@sha256:16020c2d90cecb1f1d2d731187e947535c23f38b62319dd386ae642b4b32e1fb +GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a BINFMT_BINARY=usr/bin/binfmt diff --git a/base/sysctl/Makefile b/base/sysctl/Makefile index 57b44f693..9dc6ce298 100644 --- a/base/sysctl/Makefile +++ b/base/sysctl/Makefile @@ -1,4 +1,4 @@ -GO_COMPILE=mobylinux/go-compile:236629d9fc0779db9e7573ceb8b0e92f08f553be@sha256:16020c2d90cecb1f1d2d731187e947535c23f38b62319dd386ae642b4b32e1fb +GO_COMPILE=mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 diff --git a/moby.yaml b/moby.yaml index cc993cd8e..47f8cd458 100644 --- a/moby.yaml +++ b/moby.yaml @@ -2,14 +2,14 @@ kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277" system: - name: sysctl - image: "mobylinux/sysctl:9bef9130afb8023ed1b2cecb4d961ba34a0f6628" + image: "mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c" network_mode: host pid: host ipc: host capabilities: - CAP_SYS_ADMIN - name: binfmt - image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1" + image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" binds: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc] diff --git a/test.yaml b/test.yaml index 7912eaec4..768c93859 100644 --- a/test.yaml +++ b/test.yaml @@ -2,7 +2,7 @@ kernel: "mobylinux/kernel:598481c08deafa37dccb33c88ad69fdecda57909" init: "mobylinux/init:2f1b5c1be1157cb17e5b1e6dee171dccdebb5277" system: - name: binfmt - image: "mobylinux/binfmt:a94e0587b702edaa95cc6f303464959d0eb2311c@sha256:432732b90cbe0498f5ca148d75b90bb1eabd8fbfe8c872df8b23906c225091b1" + image: "mobylinux/binfmt:bdb754f25a5d851b4f5f8d185a43dfcbb3c22d01" binds: - /proc/sys/fs/binfmt_misc:/binfmt_misc command: [/usr/bin/binfmt, -dir, /etc/binfmt.d/, -mount, /binfmt_misc] diff --git a/tools/go-compile/compile.sh b/tools/go-compile/compile.sh index ab86c88d8..e49fb5b7e 100755 --- a/tools/go-compile/compile.sh +++ b/tools/go-compile/compile.sh @@ -63,7 +63,7 @@ if [ "$GOOS" = "darwin" ] then go build -o $out "$package" else - go build -o $out -buildmode pie --ldflags '-extldflags "-static"' "$package" + go build -o $out -buildmode pie --ldflags '-s -w -extldflags "-static"' "$package" fi tar cf - $out diff --git a/tools/infrakit.hyperkit/Dockerfile.build b/tools/infrakit.hyperkit/Dockerfile.build index 46deedc8e..0ea8b29ab 100644 --- a/tools/infrakit.hyperkit/Dockerfile.build +++ b/tools/infrakit.hyperkit/Dockerfile.build @@ -1,4 +1,4 @@ -FROM mobylinux/go-compile:d2d25ac665b5148ad356d0eab3ff3762a68c633d@sha256:aab55d0c317460850e66a07dd94139cc11ea9e1c0bee88716a6a8c768740885f +FROM mobylinux/go-compile:3afebc59c5cde31024493c3f91e6102d584a30b9@sha256:e0786141ea7df8ba5735b63f2a24b4ade9eae5a02b0e04c4fca33b425ec69b0a ENV GOPATH=/go ENV PATH=/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin