diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 638af6408..666814773 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -46,7 +46,7 @@ RUN go get -u github.com/LK4D4/vndr # 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 -ENV CONTAINERD_COMMIT=v1.0.0-beta.3 +ENV CONTAINERD_COMMIT=v1.0.0-rc.0 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ @@ -54,7 +54,7 @@ RUN mkdir -p $GOPATH/src/github.com/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\\\"" + make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILD_TAGS="static_build" FROM alpine:3.6 diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index 0333f67d9..db95375d0 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:4e4f7a9be7a10f1378542c6cb739c43806f02fde-arm64 +# linuxkit/alpine:31ac51dd8ec0510a1cf585b425782569f67bfa1a-arm64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -23,7 +23,7 @@ btrfs-progs-4.10.2-r0 btrfs-progs-dev-4.10.2-r0 btrfs-progs-libs-4.10.2-r0 build-base-0.5-r0 -busybox-1.26.2-r7 +busybox-1.26.2-r9 busybox-initscripts-3.1-r1 bzip2-1.0.6-r5 ca-certificates-20161130-r2 @@ -259,7 +259,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171111-r0 +wireguard-tools-0.0.20171127-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 3d4814d5e..b7cc71853 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:585174df463ba33e6c0e2050a29a0d9e942d56cb-amd64 +# linuxkit/alpine:a99d4f10971f30b20688b4a4c40763150b9e4355-amd64 # automatically generated list of installed packages abuild-3.0.0_rc2-r8 alpine-baselayout-3.0.4-r0 @@ -23,7 +23,7 @@ btrfs-progs-4.10.2-r0 btrfs-progs-dev-4.10.2-r0 btrfs-progs-libs-4.10.2-r0 build-base-0.5-r0 -busybox-1.26.2-r7 +busybox-1.26.2-r9 busybox-initscripts-3.1-r1 bzip2-1.0.6-r5 ca-certificates-20161130-r2 @@ -267,7 +267,7 @@ util-linux-dev-2.28.2-r2 vde2-libs-2.3.2-r7 vim-8.0.0595-r0 wayland-1.13.0-r0 -wireguard-tools-0.0.20171111-r0 +wireguard-tools-0.0.20171127-r0 wireless-tools-30_pre9-r0 wpa_supplicant-2.6-r4 xfsprogs-4.5.0-r0