github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-04 00:18:53 +00:00
Code Issues Projects Releases Wiki Activity

Update to containerd v1.0.0-alpha1

Browse Source 
This is actually containerd#1141 rebased onto v1.0.0-alpha1.

The `dist` command has been integreated into `ctr` and so is removed, including
from the getty and sshd bind mounts and the test which uses it is updated..

There is no change to the version of runc vendored by containerd, so this is
unchanged.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-07-20 11:45:47 +01:00
parent ddb9efbffb
commit b3db1a887c
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/alpine/Dockerfile
View File

@@ -50,5 +50,6 @@ COPY --from=mirror /Dockerfile /Dockerfile
RUN apk update && apk upgrade -a
# v1.0.0-alpha1 plus https://github.com/containerd/containerd/pull/1141
ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git
ENV CONTAINERD_COMMIT=3455ffc08c553db0ca9fe60b4ba2b3e8a2dc960b
ENV CONTAINERD_COMMIT=d42cb88ba2b08d2ca6c8c017d629b394bf1dd08c

2
tools/alpine/versions
View File

@@ -1,4 +1,4 @@
# linuxkit/alpine:8130ebbcd8dd55e9a837067d1eb3884b2c72c5c3
# linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956
# automatically generated list of installed packages
abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0