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

alpine: bump to containerd v1.0.0-beta.2

Browse Source 
Note that a237b51511 ("Bump alpine base across the board.") inadvertently
corrupted `tools/alpine/versions.aarch64` (by updating it to the amd64 hash),
this commit corrects this as part of the rebuild.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-12 11:46:03 +01:00
parent 7f8082b253
commit 19a02ef28c
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/alpine/Dockerfile
View File

@ -44,7 +44,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.1
ENV CONTAINERD_COMMIT=v1.0.0-beta.2
RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git && \

12
tools/alpine/versions.aarch64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d-arm64
# linuxkit/alpine:d5f568a60d76990407d15fb128fc9d53e363fcee-arm64
# automatically generated list of installed packages
abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0
@ -184,10 +184,10 @@ multipath-tools-0.7.1-r1
musl-1.1.16-r13
musl-dev-1.1.16-r13
musl-utils-1.1.16-r13
ncurses-dev-6.0-r8
ncurses-libs-6.0-r8
ncurses-terminfo-6.0-r8
ncurses-terminfo-base-6.0-r8
ncurses-dev-6.0_p20170930-r0
ncurses-libs-6.0_p20170930-r0
ncurses-terminfo-6.0_p20170930-r0
ncurses-terminfo-base-6.0_p20170930-r0
nettle-3.3-r0
nfs-utils-1.3.4-r1
npth-1.2-r0
@ -205,7 +205,7 @@ patch-2.7.5-r1
pax-utils-1.2.2-r0
pcre-8.41-r0
pcsc-lite-libs-1.8.21-r0
perl-5.24.1-r2
perl-5.24.3-r1
pinentry-1.0.0-r0
pixman-0.34.0-r0
pkgconf-1.3.7-r0

12
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:ad35b6ddbc70faa07e59a9d7dee7707c08122e8d-amd64
# linuxkit/alpine:90aa5d87063049827de536371016bc02138a8f59-amd64
# automatically generated list of installed packages
abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0
@ -190,10 +190,10 @@ multipath-tools-0.7.1-r1
musl-1.1.16-r13
musl-dev-1.1.16-r13
musl-utils-1.1.16-r13
ncurses-dev-6.0-r8
ncurses-libs-6.0-r8
ncurses-terminfo-6.0-r8
ncurses-terminfo-base-6.0-r8
ncurses-dev-6.0_p20170930-r0
ncurses-libs-6.0_p20170930-r0
ncurses-terminfo-6.0_p20170930-r0
ncurses-terminfo-base-6.0_p20170930-r0
nettle-3.3-r0
nfs-utils-1.3.4-r1
npth-1.2-r0
@ -213,7 +213,7 @@ patch-2.7.5-r1
pax-utils-1.2.2-r0
pcre-8.41-r0
pcsc-lite-libs-1.8.21-r0
perl-5.24.1-r2
perl-5.24.3-r1
pinentry-1.0.0-r0
pixman-0.34.0-r0
pkgconf-1.3.7-r0