github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Bump to containerd v1.0.0-alpha4 and runc v1.0.0-rc4

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-08-11 15:37:23 +01:00
parent da6cbf74f3
commit e11c1c0224
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine
RUN \ RUN \
apk add \ apk add \
btrfs-progs-dev \ btrfs-progs-dev \

4
pkg/runc/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:4a9e5f80a774bbea494d49324428a22c6f018865 as alpine FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 as alpine
RUN \ RUN \
apk add \ apk add \
bash \ bash \
@ -11,7 +11,7 @@ RUN \
make \ make \
&& true && true
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin
ENV RUNC_COMMIT=45bde006ca8c90e089894508708bcf0e2cdf9e13 ENV RUNC_COMMIT=v1.0.0-rc4
RUN mkdir -p $GOPATH/src/github.com/opencontainers && \ RUN mkdir -p $GOPATH/src/github.com/opencontainers && \
cd $GOPATH/src/github.com/opencontainers && \ cd $GOPATH/src/github.com/opencontainers && \
git clone https://github.com/opencontainers/runc.git git clone https://github.com/opencontainers/runc.git

2
test/pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror FROM linuxkit/alpine:6ed3b299f5243acb6459b4993549c5045e4ad7f4 AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
# btrfs-progfs is required for btrfs test (mkfs.btrfs) # btrfs-progfs is required for btrfs test (mkfs.btrfs)
# util-linux is required for btrfs test (losetup) # util-linux is required for btrfs test (losetup)