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

tests: Update alpine base to multi-arch

Browse Source 
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 <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-08-02 18:45:42 +01:00
parent 684ad6778d
commit 551e43294f
10 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/pkg/containerd/Dockerfile
View File

@ -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/ 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)

2
test/pkg/docker-bench/Dockerfile
View File

@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \ alpine-baselayout \

1
test/pkg/docker-bench/Makefile
View File

@ -1,6 +1,7 @@
IMAGE=test-docker-bench IMAGE=test-docker-bench
DEPS=bench_runner.sh DEPS=bench_runner.sh
NETWORK=1 NETWORK=1
ARCHES=x86_64
include ../../../pkg/package.mk include ../../../pkg/package.mk

2
test/pkg/kernel-config/Dockerfile
View File

@ -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 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 RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl bash

1
test/pkg/ltp/Makefile
View File

@ -1,5 +1,6 @@
IMAGE=test-ltp IMAGE=test-ltp
DEPS=check.sh DEPS=check.sh
NETWORK=1 NETWORK=1
ARCHES=x86_64
include ../../../pkg/package.mk include ../../../pkg/package.mk

4
test/pkg/ns/Dockerfile
View File

@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
alpine-baselayout \ alpine-baselayout \
@ -8,7 +8,7 @@ RUN apk add --no-cache --initdb -p /out \
musl musl
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache 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 \ RUN apk add --no-cache \
build-base \ build-base \
git \ git \

1
test/pkg/ns/Makefile
View File

@ -1,5 +1,6 @@
IMAGE=test-ns IMAGE=test-ns
NETWORK=1 NETWORK=1
DEPS=config.template.json $(wildcard *.sh) DEPS=config.template.json $(wildcard *.sh)
ARCHES=x86_64
include ../../../pkg/package.mk include ../../../pkg/package.mk

2
test/pkg/poweroff/Dockerfile
View File

@ -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 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
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache

4
test/pkg/virtsock/Dockerfile
View File

@ -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 mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out \ RUN apk add --no-cache --initdb -p /out \
tini tini
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache 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 RUN apk add --no-cache go musl-dev git make
ENV GOPATH=/go PATH=$PATH:/go/bin ENV GOPATH=/go PATH=$PATH:/go/bin

1
test/pkg/virtsock/Makefile
View File

@ -1,6 +1,7 @@
IMAGE=test-virtsock IMAGE=test-virtsock
DEPS= DEPS=
NETWORK=1 NETWORK=1
ARCHES=x86_64
include ../../../pkg/package.mk include ../../../pkg/package.mk