diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index a26fa20db..4f038cb82 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN go get -u github.com/golang/lint/golint RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/LK4D4/vndr -# checkout containerd +# checkout and compile containerd # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # `test/pkg/containerd/Dockerfile` when changing this. ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git @@ -50,6 +50,9 @@ RUN mkdir -p $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ cd $GOPATH/src/github.com/containerd/containerd && \ git checkout $CONTAINERD_COMMIT +RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make +RUN cd $GOPATH/src/github.com/containerd/containerd && \ + make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\"" FROM $BASE diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 163d440c1..8947c7fd5 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:415e9417004bbd8940a4c2303195b20a5dbd8c9a-arm64 +# linuxkit/alpine:a662efbaf4226d0ac358cc009ead9a95b3b1dd99-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index b202a4abb..968701e24 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:79987c65c66700171c073151c1d3f0372597bec2-amd64 +# linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0