From 1bd9e9b5a2ffea1860b02dbfae9255b27e129b08 Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Sun, 28 Jan 2024 10:54:20 +0200 Subject: [PATCH] tests: Update packages to the latest linuxkit/alpine Signed-off-by: Avi Deitcher --- test/pkg/containerd/Dockerfile | 2 +- test/pkg/docker-bench/Dockerfile | 2 +- test/pkg/kernel-config/Dockerfile | 2 +- test/pkg/ns/Dockerfile | 4 ++-- test/pkg/virtsock/Dockerfile | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/pkg/containerd/Dockerfile b/test/pkg/containerd/Dockerfile index ade4beaae..7b6999832 100644 --- a/test/pkg/containerd/Dockerfile +++ b/test/pkg/containerd/Dockerfile @@ -1,5 +1,5 @@ FROM linuxkit/containerd-dev:8f880c3f91e9d43d8d3e754847335e57980836ed as containerd-dev -FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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 751054ccf..9d8aa8047 100644 --- a/test/pkg/docker-bench/Dockerfile +++ b/test/pkg/docker-bench/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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/kernel-config/Dockerfile b/test/pkg/kernel-config/Dockerfile index d3a9ec2f6..3da892754 100644 --- a/test/pkg/kernel-config/Dockerfile +++ b/test/pkg/kernel-config/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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/ns/Dockerfile b/test/pkg/ns/Dockerfile index 12933b956..28393e3ed 100644 --- a/test/pkg/ns/Dockerfile +++ b/test/pkg/ns/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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:275ef778d89133ebec5e80d82c664c3549f919d4 AS build +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 AS build RUN apk add --no-cache \ build-base \ git \ diff --git a/test/pkg/virtsock/Dockerfile b/test/pkg/virtsock/Dockerfile index aaaec2efa..a4743f70f 100644 --- a/test/pkg/virtsock/Dockerfile +++ b/test/pkg/virtsock/Dockerfile @@ -1,10 +1,10 @@ -FROM linuxkit/alpine:275ef778d89133ebec5e80d82c664c3549f919d4 AS mirror +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 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:275ef778d89133ebec5e80d82c664c3549f919d4 AS build +FROM linuxkit/alpine:a720d2b1b83556653abd52d61faa0fe020c2b161 AS build RUN apk add --no-cache go musl-dev git make ENV GOPATH=/go PATH=$PATH:/go/bin GO111MODULE=off