JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #433 from tonistiigi/hack-mitigation 

hack: mitigate bug in old docker version
docker-18.09
Tõnis Tiigi 2018-06-05 00:14:54 -07:00 committed by GitHub
parent ad20ed1fe3 347b6a3d74
commit a80e6eba25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/dockerfiles/test.Dockerfile
View File

@ -65,6 +65,8 @@ COPY --from=containerd /go/src/github.com/containerd/containerd/bin/containerd*
FROM buildkit-base AS buildkitd.oci_only FROM buildkit-base AS buildkitd.oci_only
ENV CGO_ENABLED=1 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 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 FROM buildkit-base AS buildkitd.containerd_only
@ -129,6 +131,8 @@ WORKDIR /go/src/github.com/AkihiroSuda/rootlesskit
FROM rootlesskit-base as rootlesskit FROM rootlesskit-base as rootlesskit
ARG ROOTLESSKIT_VERSION ARG ROOTLESSKIT_VERSION
# mitigate https://github.com/moby/moby/pull/35456
ENV GOOS=linux
RUN git checkout -q "$ROOTLESSKIT_VERSION" \ RUN git checkout -q "$ROOTLESSKIT_VERSION" \
&& go build -o /rootlesskit ./cmd/rootlesskit && go build -o /rootlesskit ./cmd/rootlesskit