From 347b6a3d74bb643c302c3a163cf1d10e0f89f804 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 4 Jun 2018 23:54:44 -0700 Subject: [PATCH] hack: mitigate bug in old docker version Signed-off-by: Tonis Tiigi --- hack/dockerfiles/test.Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/dockerfiles/test.Dockerfile b/hack/dockerfiles/test.Dockerfile index 025b7e3e..69ccc93e 100644 --- a/hack/dockerfiles/test.Dockerfile +++ b/hack/dockerfiles/test.Dockerfile @@ -65,6 +65,8 @@ COPY --from=containerd /go/src/github.com/containerd/containerd/bin/containerd* FROM buildkit-base AS buildkitd.oci_only ENV CGO_ENABLED=1 +# mitigate https://github.com/moby/moby/pull/35456 +WORKDIR /go/src/github.com/moby/buildkit RUN go build -installsuffix netgo -ldflags "$(cat .tmp/ldflags) -w -extldflags -static" -tags 'no_containerd_worker seccomp netgo cgo static_build' -o /usr/bin/buildkitd.oci_only ./cmd/buildkitd FROM buildkit-base AS buildkitd.containerd_only @@ -129,6 +131,8 @@ WORKDIR /go/src/github.com/AkihiroSuda/rootlesskit FROM rootlesskit-base as rootlesskit ARG ROOTLESSKIT_VERSION +# mitigate https://github.com/moby/moby/pull/35456 +ENV GOOS=linux RUN git checkout -q "$ROOTLESSKIT_VERSION" \ && go build -o /rootlesskit ./cmd/rootlesskit