0001-Use-stretch-as-base-to-work-on-ARTPEC-6-7.patch

From aeb3ea7769880b80aea86bc0efb45ae1d80e865e Mon Sep 17 00:00:00 2001
From: Joakim Roubert <joakim.roubert@axis.com>
Date: Thu, 24 Jun 2021 17:37:15 +0200
Subject: [PATCH] Use stretch as base to work on ARTPEC-6/7

---
 Dockerfile        | 8 ++++----
 Dockerfile.buildx | 4 ++--
 Dockerfile.e2e    | 2 +-
 Dockerfile.simple | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3fa4058288..e850594591 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ARG VPNKIT_VERSION=0.5.0
 ARG DOCKER_BUILDTAGS="apparmor seccomp"
 
-ARG BASE_DEBIAN_DISTRO="buster"
+ARG BASE_DEBIAN_DISTRO="stretch"
 ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
 
 FROM ${GOLANG_IMAGE} AS base
@@ -93,7 +93,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-frozen-images-aptlib,target=/var/l
 COPY contrib/download-frozen-image-v2.sh /
 ARG TARGETARCH
 RUN /download-frozen-image-v2.sh /build \
-        buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \
+        buildpack-deps:stretch@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \
         busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \
         busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \
         debian:bullseye@sha256:7190e972ab16aefea4d758ebe42a293f4e5c5be63595f4d03a5b9bf6839a4344 \
@@ -126,7 +126,7 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib
             binutils-mingw-w64 \
             g++-mingw-w64-x86-64 \
             libapparmor-dev \
-            libbtrfs-dev \
+            btrfs-progs \
             libdevmapper-dev \
             libseccomp-dev/buster-backports \
             libsystemd-dev \
@@ -170,7 +170,7 @@ ARG DEBIAN_FRONTEND
 RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
     --mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
         apt-get update && apt-get install -y --no-install-recommends \
-            libbtrfs-dev
+            btrfs-progs
 ARG CONTAINERD_COMMIT
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
diff --git a/Dockerfile.buildx b/Dockerfile.buildx
index d3a46964dd..c795c23ba0 100644
--- a/Dockerfile.buildx
+++ b/Dockerfile.buildx
@@ -2,7 +2,7 @@ ARG GO_VERSION=1.13.15
 ARG BUILDX_COMMIT=v0.5.1
 ARG BUILDX_REPO=https://github.com/docker/buildx.git
 
-FROM golang:${GO_VERSION}-buster AS build
+FROM golang:${GO_VERSION}-stretch AS build
 ARG BUILDX_REPO
 RUN git clone "${BUILDX_REPO}" /buildx
 WORKDIR /buildx
@@ -21,6 +21,6 @@ RUN GOOS="${GOOS}" GOARCH="${GOARCH}" BUILDX_COMMIT="${BUILDX_COMMIT}"; \
     "; \
     go build -mod=vendor -ldflags "${ldflags}" -o /usr/bin/buildx ./cmd/buildx
 
-FROM golang:${GO_VERSION}-buster
+FROM golang:${GO_VERSION}-stretch
 COPY --from=build /usr/bin/buildx /usr/bin/buildx
 ENTRYPOINT ["/usr/bin/buildx"]
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index b798c86175..42a02629bd 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -18,7 +18,7 @@ FROM base AS frozen-images
 # Get useful and necessary Hub images so we can "docker load" locally instead of pulling
 COPY contrib/download-frozen-image-v2.sh /
 RUN /download-frozen-image-v2.sh /build \
-	buildpack-deps:buster@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \
+	buildpack-deps:stretch@sha256:d0abb4b1e5c664828b93e8b6ac84d10bce45ee469999bef88304be04a2709491 \
 	busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \
 	busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \
 	debian:bullseye@sha256:7190e972ab16aefea4d758ebe42a293f4e5c5be63595f4d03a5b9bf6839a4344 \
diff --git a/Dockerfile.simple b/Dockerfile.simple
index a46ff4aa34..40fcd7aa59 100644
--- a/Dockerfile.simple
+++ b/Dockerfile.simple
@@ -7,7 +7,7 @@
 
 ARG GO_VERSION=1.13.15
 
-FROM golang:${GO_VERSION}-buster
+FROM golang:${GO_VERSION}-stretch
 ENV GO111MODULE=off
 
 # allow replacing httpredir or deb mirror
@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		gcc \
 		git \
 		libapparmor-dev \
-		libbtrfs-dev \
+		btrfs-progs \
 		libdevmapper-dev \
 		libseccomp-dev \
 		ca-certificates \
-- 
2.30.2