From 551e43294f771b32bec2d0439dccbbdff5998c0e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 2 Aug 2017 18:45:42 +0100 Subject: [PATCH] tests: Update alpine base to multi-arch The following packages did not work on aarch64: - linuxkit/test-docker-bench - linuxkit/test-ltp - linuxkit/test-ns - linuxkit/test-virtsock Signed-off-by: Rolf Neugebauer --- test/pkg/containerd/Dockerfile | 2 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/docker-bench/Makefile | 1 + test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ltp/Makefile | 1 + test/pkg/ns/Dockerfile | 4 ++-- test/pkg/ns/Makefile | 1 + test/pkg/poweroff/Dockerfile | 2 +- test/pkg/virtsock/Dockerfile | 4 ++-- test/pkg/virtsock/Makefile | 1 + 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index e23a912e1..a4723bb45 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ # btrfs-progfs is required for btrfs test (mkfs.btrfs) # util-linux is required for btrfs test (losetup) diff --git a/test/pkg/docker-bench/Dockerfile b/test/pkg/docker-bench/Dockerfile index 91d2b15e9..b48daf23a 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ diff --git a/test/pkg/docker-bench/Makefile b/test/pkg/docker-bench/Makefile index 9caf7aaf6..a2d8ba568 100644 --- a/test/pkg/docker-bench/Makefile +++ b/test/pkg/docker-bench/Makefile @@ -1,6 +1,7 @@ IMAGE=test-docker-bench DEPS=bench_runner.sh NETWORK=1 +ARCHES=x86_64 include ../../../pkg/package.mk diff --git a/test/pkg/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index 1e036e8cb..96ec6c3be 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror 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 bash diff --git a/test/pkg/ltp/Makefile b/test/pkg/ltp/Makefile index 09abffbc5..94ea313e9 100644 --- a/test/pkg/ltp/Makefile +++ b/test/pkg/ltp/Makefile @@ -1,5 +1,6 @@ IMAGE=test-ltp DEPS=check.sh NETWORK=1 +ARCHES=x86_64 include ../../../pkg/package.mk diff --git a/test/pkg/ns/Dockerfile b/test/pkg/ns/Dockerfile index 4226ccaa1..0a8e559b1 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ alpine-baselayout \ @@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \ musl RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS build +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/ns/Makefile b/test/pkg/ns/Makefile index 200953176..11a74a37c 100644 --- a/test/pkg/ns/Makefile +++ b/test/pkg/ns/Makefile @@ -1,5 +1,6 @@ IMAGE=test-ns NETWORK=1 DEPS=config.template.json $(wildcard *.sh) +ARCHES=x86_64 include ../../../pkg/package.mk diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 9cbe1a82c..8358be398 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror 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 rm -rf /out/etc/apk /out/lib/apk /out/var/cache diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index aa96e7c98..18578b498 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS mirror RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/ RUN apk add --no-cache --initdb -p /out \ tini RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS build +FROM linuxkit/alpine:87a0cd10449d72f374f950004467737dbf440630 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/test/pkg/virtsock/Makefile b/test/pkg/virtsock/Makefile index 336e0c224..d1e5c5baf 100644 --- a/test/pkg/virtsock/Makefile +++ b/test/pkg/virtsock/Makefile @@ -1,6 +1,7 @@ IMAGE=test-virtsock DEPS= NETWORK=1 +ARCHES=x86_64 include ../../../pkg/package.mk