From 5f59ea331dfbf71cab65c76f8722a39d30f31407 Mon Sep 17 00:00:00 2001
From: Your <sdowell@google.com>
Date: Fri, 17 Jun 2022 17:36:19 +0000
Subject: [PATCH] upgrade base image to address vulnerabilities

---
 Dockerfile.in | 5 -----
 Makefile      | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Dockerfile.in b/Dockerfile.in
index 152eb0b..3c82e71 100644
--- a/Dockerfile.in
+++ b/Dockerfile.in
@@ -49,8 +49,6 @@
 #############################################################################
 FROM {ARG_FROM} as prep
 
-RUN echo "deb http://deb.debian.org/debian/ buster-backports main contrib" > \
-        /etc/apt/sources.list.d/backports.list
 RUN apt-get -q -y update
 RUN apt-get -q -y upgrade
 RUN apt-get -q -y install --no-install-recommends \
@@ -59,9 +57,6 @@ RUN apt-get -q -y install --no-install-recommends \
         socat \
         openssh-client \
         git
-# We want a newer git than the norm.
-RUN apt-get -q -y -t buster-backports install --no-install-recommends \
-        git
 RUN apt-get -q -y autoremove
 RUN rm -rf /var/lib/apt/lists/*
 
diff --git a/Makefile b/Makefile
index 19aeae3..acb47f5 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ ALL_PLATFORMS := linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x
 OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS))
 ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))
 
-BASEIMAGE ?= k8s.gcr.io/build-image/debian-base:buster-v1.10.0
+BASEIMAGE ?= k8s.gcr.io/build-image/debian-base:bullseye-v1.3.0
 
 IMAGE := $(REGISTRY)/$(BIN)
 TAG := $(VERSION)__$(OS)_$(ARCH)