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

tools/alpine: Update containerd to v1.3.2

Browse Source 
- Disable the devmapper snapshotter. We are not using it
- Cherry-pick and upstream commit to be able to disable
  the devmapper integration tests

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2020-01-07 19:24:51 +00:00
parent fb14ee6854
commit 44e27a1dfb
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/alpine/Dockerfile
View File

@ -54,16 +54,20 @@ RUN go get -u github.com/LK4D4/vndr
# checkout and compile containerd # checkout and compile containerd
# Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and # Update `FROM` in `pkg/containerd/Dockerfile`, `pkg/init/Dockerfile` and
# `test/pkg/containerd/Dockerfile` when changing this. # `test/pkg/containerd/Dockerfile` when changing this.
# For v1.3.x cherry-pick a upstream commit to allow disabling some tests.
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.2.8 ENV CONTAINERD_COMMIT=v1.3.2
RUN mkdir -p $GOPATH/src/github.com/containerd && \ RUN mkdir -p $GOPATH/src/github.com/containerd && \
cd $GOPATH/src/github.com/containerd && \ cd $GOPATH/src/github.com/containerd && \
git clone https://github.com/containerd/containerd.git && \ git clone https://github.com/containerd/containerd.git && \
cd $GOPATH/src/github.com/containerd/containerd && \ cd $GOPATH/src/github.com/containerd/containerd && \
git checkout $CONTAINERD_COMMIT git checkout $CONTAINERD_COMMIT && \
git config --global user.email "you@example.com" && \
git config --global user.name "Your Name" && \
git cherry-pick 94d499843c0202af9636cad522d30eaf9ffed798
RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev RUN apk add --no-cache btrfs-progs-dev gcc libc-dev linux-headers make libseccomp-dev
RUN cd $GOPATH/src/github.com/containerd/containerd && \ RUN cd $GOPATH/src/github.com/containerd/containerd && \
make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILD_TAGS="static_build" make binaries EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS='-extldflags "-fno-PIC -static"' BUILDTAGS="static_build no_devmapper"
# Checkout and compile iucode-tool for Intel CPU microcode # Checkout and compile iucode-tool for Intel CPU microcode
# On non-x86_64 create a dummy file to copy below. # On non-x86_64 create a dummy file to copy below.

8
tools/alpine/versions.aarch64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:db53af94f3377c2ecc78b0168f4ae7be8b9c5d6d-arm64 # linuxkit/alpine:dac4b3c8e27e76075127b3ce45df7fdf75943f54-arm64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.3.1-r0 abuild-3.3.1-r0
alpine-baselayout-3.1.0-r3 alpine-baselayout-3.1.0-r3
@ -300,9 +300,9 @@ vde2-libs-2.3.2-r10
vim-8.1.1365-r0 vim-8.1.1365-r0
virglrenderer-0.7.0-r1 virglrenderer-0.7.0-r1
wayland-libs-server-1.16.0-r0 wayland-libs-server-1.16.0-r0
wireguard-tools-0.0.20191219-r0 wireguard-tools-1.0.20200102-r0
wireguard-tools-wg-0.0.20191219-r0 wireguard-tools-wg-1.0.20200102-r0
wireguard-tools-wg-quick-0.0.20191219-r0 wireguard-tools-wg-quick-1.0.20200102-r0
wireless-tools-30_pre9-r0 wireless-tools-30_pre9-r0
wpa_supplicant-2.7-r5 wpa_supplicant-2.7-r5
wpa_supplicant-openrc-2.7-r5 wpa_supplicant-openrc-2.7-r5

8
tools/alpine/versions.s390x
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:99c9ee06075b6919b067d67f998ba02f8adc426e-s390x # linuxkit/alpine:53d529742dd92e941f2dd5e551e114dc45022e73-s390x
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.3.1-r0 abuild-3.3.1-r0
alpine-baselayout-3.1.0-r3 alpine-baselayout-3.1.0-r3
@ -293,9 +293,9 @@ vde2-libs-2.3.2-r10
vim-8.1.1365-r0 vim-8.1.1365-r0
virglrenderer-0.7.0-r1 virglrenderer-0.7.0-r1
wayland-libs-server-1.16.0-r0 wayland-libs-server-1.16.0-r0
wireguard-tools-0.0.20191219-r0 wireguard-tools-1.0.20200102-r0
wireguard-tools-wg-0.0.20191219-r0 wireguard-tools-wg-1.0.20200102-r0
wireguard-tools-wg-quick-0.0.20191219-r0 wireguard-tools-wg-quick-1.0.20200102-r0
wireless-tools-30_pre9-r0 wireless-tools-30_pre9-r0
wpa_supplicant-2.7-r5 wpa_supplicant-2.7-r5
wpa_supplicant-openrc-2.7-r5 wpa_supplicant-openrc-2.7-r5

8
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:129009483d68d7d396b8014cddcd22c0f1601e02-amd64 # linuxkit/alpine:5fd4e83fea8bd04f21d1611d04c93d6ccaca785a-amd64
# automatically generated list of installed packages # automatically generated list of installed packages
abuild-3.3.1-r0 abuild-3.3.1-r0
alpine-baselayout-3.1.0-r3 alpine-baselayout-3.1.0-r3
@ -312,9 +312,9 @@ vde2-libs-2.3.2-r10
vim-8.1.1365-r0 vim-8.1.1365-r0
virglrenderer-0.7.0-r1 virglrenderer-0.7.0-r1
wayland-libs-server-1.16.0-r0 wayland-libs-server-1.16.0-r0
wireguard-tools-0.0.20191219-r0 wireguard-tools-1.0.20200102-r0
wireguard-tools-wg-0.0.20191219-r0 wireguard-tools-wg-1.0.20200102-r0
wireguard-tools-wg-quick-0.0.20191219-r0 wireguard-tools-wg-quick-1.0.20200102-r0
wireless-tools-30_pre9-r0 wireless-tools-30_pre9-r0
wpa_supplicant-2.7-r5 wpa_supplicant-2.7-r5
wpa_supplicant-openrc-2.7-r5 wpa_supplicant-openrc-2.7-r5