Skip to content

Commit

Permalink
[0.8] update to debian bullseye
Browse files Browse the repository at this point in the history
Both go1.13 and debian buster reached EOL, and some packages are
no longer available for buster. It's worth noting that this branch
is _only_ used for vendoring in moby/docker 20.10, so updating versions
here is not affecting that, but allows us to run CI here for validatoin.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Sep 4, 2022
1 parent 534c361 commit 3502d5d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN apk add --no-cache git
FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:6f7d999551dd471b58f70716754290495690efa8421e0a1fcf18eb11d0c0a537 AS xgo

# gobuild is base stage for compiling go/cgo
FROM --platform=$BUILDPLATFORM golang:1.18-buster AS gobuild-minimal
FROM --platform=$BUILDPLATFORM golang:1.18-bullseye AS gobuild-minimal
COPY --from=xgo / /
RUN apt-get update && apt-get install --no-install-recommends -y libseccomp-dev file

Expand All @@ -38,16 +38,16 @@ RUN dpkg --add-architecture s390x && \
--no-install-recommends

FROM gobuild-minimal AS gobuild-cross-amd64-arm
RUN echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
RUN apt-get update && apt-get install --no-install-recommends -y libseccomp2=2.4.4-1~bpo10+1 libseccomp-dev=2.4.4-1~bpo10+1
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
RUN apt-get update && apt-get install --no-install-recommends -y libseccomp2=2.5.1-1+deb11u1 libseccomp-dev=2.5.1-1+deb11u1
RUN dpkg --add-architecture armel && \
dpkg --add-architecture armhf && \
dpkg --add-architecture arm64 && \
apt-get update && \
apt-get --no-install-recommends install -y \
crossbuild-essential-armel libseccomp2:armel=2.4.4-1~bpo10+1 libseccomp-dev:armel=2.4.4-1~bpo10+1 \
crossbuild-essential-armhf libseccomp2:armhf=2.4.4-1~bpo10+1 libseccomp-dev:armhf=2.4.4-1~bpo10+1 \
crossbuild-essential-arm64 libseccomp2:arm64=2.4.4-1~bpo10+1 libseccomp-dev:arm64=2.4.4-1~bpo10+1 \
crossbuild-essential-armel libseccomp2:armel=2.5.1-1+deb11u1 libseccomp-dev:armel=2.5.1-1+deb11u1 \
crossbuild-essential-armhf libseccomp2:armhf=2.5.1-1+deb11u1 libseccomp-dev:armhf=2.5.1-1+deb11u1 \
crossbuild-essential-arm64 libseccomp2:arm64=2.5.1-1+deb11u1 libseccomp-dev:arm64=2.5.1-1+deb11u1 \
--no-install-recommends

# define all valid target configurations for compilation
Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:6f7d999551dd471b58f70716754290495690efa8421e0a1fcf18eb11d0c0a537 AS xgo

FROM --platform=$BUILDPLATFORM golang:1.18-buster AS base
FROM --platform=$BUILDPLATFORM golang:1.18-bullseye AS base
COPY --from=xgo / /
WORKDIR /src
ENV GOFLAGS=-mod=vendor
Expand Down
2 changes: 1 addition & 1 deletion hack/dockerfiles/generated-files.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

# protoc is dynamically linked to glibc to can't use golang:1.10-alpine
FROM golang:1.18-buster AS gobuild-base
FROM golang:1.18-bullseye AS gobuild-base

RUN apt-get update && apt-get --no-install-recommends install -y \
git \
Expand Down
2 changes: 1 addition & 1 deletion util/archutil/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim AS base
FROM debian:bullseye-slim AS base
RUN apt-get update && apt-get --no-install-recommends install -y \
binutils-arm-linux-gnueabihf \
binutils-aarch64-linux-gnu \
Expand Down

0 comments on commit 3502d5d

Please sign in to comment.