github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 11:13:22 +00:00
Code Issues Projects Releases Wiki Activity

Bump packages to new alpine w/ containerd v1.1.2

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2018-07-16 10:29:41 +01:00
parent 6b6596f881
commit eb48b1284c
3 changed files with 4 additions and 4 deletions
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:daed76b8f1d28cdeeee215a95b9671c682a405dc as alpine FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 as alpine
RUN apk add tzdata RUN apk add tzdata
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd

4
pkg/init/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS build FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 AS build
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
ADD usermode-helper.c ./ ADD usermode-helper.c ./
@@ -16,7 +16,7 @@ RUN mkdir /tmp/bin && cd /tmp/bin/ && cp /go/bin/rc.init . && ln -s rc.init rc.s
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service RUN go-compile.sh /go/src/cmd/service
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 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/
RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl

2
test/pkg/containerd/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM linuxkit/alpine:daed76b8f1d28cdeeee215a95b9671c682a405dc AS mirror FROM linuxkit/alpine:8a89682421abf0d886d777235a05f4a04a736df2 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)