From ebc7bd181aa1cb25736567f6f897c321b62f8626 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 29 May 2017 16:41:40 +0100 Subject: [PATCH] pkg: Update the binfmt packages to use the Alpine base compiling Signed-off-by: Rolf Neugebauer --- pkg/binfmt/Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 2bb368d34..8d8acae13 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -4,18 +4,19 @@ RUN apk add \ qemu-arm \ qemu-ppc64le -FROM linuxkit/go-compile:4513068d9a7e919e4ec42e2d7ee879ff5b95b7f5@sha256:bdfadbe3e4ec699ca45b67453662321ec270f2d1a1dbdbf09625776d3ebd68c5 AS build -COPY main.go main.go -RUN echo "gofmt..." && test -z $(gofmt -s -l main.go) && \ - echo "go vet..." && test -z $(GOOS=linux go tool vet -printf=false main.go) && \ - echo "golint..." && test -z $(golint main.go) -RUN go build -o usr/bin/binfmt -buildmode pie -ldflags "-s -w -extldflags -static" main.go +FROM linuxkit/alpine:451603daf499e3a40308dbf5571dcffed2343ffa AS mirror + +RUN apk add --no-cache go musl-dev +ENV GOPATH=/go PATH=$PATH:/go/bin + +COPY main.go /go/src/binfmt/ +RUN go-compile.sh /go/src/binfmt FROM scratch ENTRYPOINT [] WORKDIR / COPY --from=qemu usr/bin/qemu-* usr/bin/ -COPY --from=build usr/bin/binfmt usr/bin/binfmt +COPY --from=mirror /go/bin/binfmt usr/bin/binfmt COPY etc/binfmt.d/00_linuxkit.conf etc/binfmt.d/00_linuxkit.conf CMD ["/usr/bin/binfmt", "-dir", "/etc/binfmt.d/", "-mount", "/binfmt_misc"] LABEL org.mobyproject.config='{"binds": ["/proc/sys/fs/binfmt_misc:/binfmt_misc"], "readonly": true}'