From 2e5f24a2c0d18cabf62c1e2932fbdb1ee5de164a Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 31 Jan 2018 09:21:47 +0000 Subject: [PATCH] alpine: Bump to containerd v1.0.2-rc.0 https://github.com/containerd/containerd/releases/tag/v1.0.2-rc.0 $ git log --oneline --no-merges v1.0.1..v1.0.2-rc.0 a67e9d27 release: prepare 1.0.2-rc.0 91c3b8bf content/testsuite: pass context to hold lease c910b470 content/testsuite: ensure unique content per test 45e7aa52 Update copy to discard over truncate d7a0e702 Add resume content test cases 5c21576e Fix duplicate directories entries on metadata change af4455b3 vendor: update go-runc to reduce gc pressure f042dc58 cmd/containerd-shim: aggressive memory reclamation 8cf32d34 cmd/containerd-shim, reaper: reduce channel allocation 367eddb4 archive, cio, cmd, linux: use buffer pools 852f989a Update runc to 9f9c96235cc97674e935002fc3d78361b69 a03fb1bd Fix NPE in dialer d04746b4 Update metadata image store to be initialized once 5a67161d Update namespace empty check to use buckets Signed-off-by: Ian Campbell --- tools/alpine/Dockerfile | 2 +- tools/alpine/versions.aarch64 | 4 ++-- tools/alpine/versions.x86_64 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index cfb22b281..a1fcbd6f2 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -43,7 +43,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.1 +ENV CONTAINERD_COMMIT=v1.0.2-rc.0 RUN mkdir -p $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \ git clone https://github.com/containerd/containerd.git && \ diff --git a/tools/alpine/versions.aarch64 b/tools/alpine/versions.aarch64 index c2dc9a886..5e6ad943b 100644 --- a/tools/alpine/versions.aarch64 +++ b/tools/alpine/versions.aarch64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:4da19976a059bc710eeff8d8daa8a2d3a48b851b-arm64 +# linuxkit/alpine:7c82197bb5138e34a0f6a387c0fc52e123e599ab-arm64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r7 +busybox-1.27.2-r8 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0 diff --git a/tools/alpine/versions.x86_64 b/tools/alpine/versions.x86_64 index 4cf06e60f..277a75d03 100644 --- a/tools/alpine/versions.x86_64 +++ b/tools/alpine/versions.x86_64 @@ -1,4 +1,4 @@ -# linuxkit/alpine:cba395fbc278daee841106801aba1e1bd7e0f2f7-amd64 +# linuxkit/alpine:4d6cfc5de9c29ad5cb633db9638660ba22d2fea5-amd64 # automatically generated list of installed packages abuild-3.1.0-r3 alpine-baselayout-3.0.5-r2 @@ -25,7 +25,7 @@ btrfs-progs-4.13.2-r0 btrfs-progs-dev-4.13.2-r0 btrfs-progs-libs-4.13.2-r0 build-base-0.5-r0 -busybox-1.27.2-r7 +busybox-1.27.2-r8 busybox-initscripts-3.1-r2 bzip2-1.0.6-r6 ca-certificates-20171114-r0