From 9f5edb5c669c7ee8fbaed659b117a1aea9256d2d Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Tue, 18 Jul 2023 15:11:32 +0200
Subject: [PATCH 1/2] Upgrading base container to bullseye-slim.

---
 docker-images/base/Dockerfile | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/docker-images/base/Dockerfile b/docker-images/base/Dockerfile
index 39d387a..b470315 100644
--- a/docker-images/base/Dockerfile
+++ b/docker-images/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster as unison
+FROM debian:bullseye-slim as unison
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \
@@ -9,12 +9,12 @@ RUN \
   wget \
   ocaml-native-compilers && \
   cd /tmp/ && \
-  wget https://github.com/bcpierce00/unison/archive/v2.51.2.tar.gz && \
-  tar -xzvf v2.51.2.tar.gz && \
-  cd /tmp/unison-2.51.2 && \
+  wget https://github.com/bcpierce00/unison/archive/v2.53.3.tar.gz && \
+  tar -xzvf v2.53.3.tar.gz && \
+  cd /tmp/unison-2.53.3 && \
   make
 
-FROM debian:buster
+FROM debian:bullseye-slim
 
 RUN \
   set -x && \
@@ -54,19 +54,6 @@ RUN \
   /var/log/* \
   /tmp/*
 
-# Temp workaround bug in system.d with kernel 5.8
-RUN \
-  echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list && \
-  set -x && \
-  export DEBIAN_FRONTEND=noninteractive && \
-  apt-get update && \
-  apt-get -y -o Dpkg::Options::="--force-confnew" -t=buster-backports upgrade systemd && \
-  apt-get clean  && \
-  rm -rf \
-  /var/lib/apt/lists/* \
-  /var/log/* \
-  /tmp/*
-
 RUN \
   echo 'UseDNS no' >> /etc/ssh/sshd_config && \
   mkdir -p /var/run/sshd && \
@@ -89,8 +76,8 @@ RUN \
   /etc/machine-id \
   /var/lib/dbus/machine-id
 
-COPY --from=unison /tmp/unison-2.51.2/src/unison /usr/local/bin/
-COPY --from=unison /tmp/unison-2.51.2/src/unison-fsmonitor /usr/local/bin/
+COPY --from=unison /tmp/unison-2.53.3/src/unison /usr/local/bin/
+COPY --from=unison /tmp/unison-2.53.3/src/unison-fsmonitor /usr/local/bin/
 COPY ./ce-dev-ownership.sh /opt/
 COPY ./ce-dev-ssh.sh /opt/
 COPY ./unison.sh /opt/
@@ -98,7 +85,7 @@ COPY ./unison-startup.sh /opt/
 COPY ./procmailrc /etc/procmailrc
 
 RUN \
-  wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64 -O /usr/local/bin/mkcert && \
+  wget https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-amd64 -O /usr/local/bin/mkcert && \
   mkdir -p /home/ce-dev/deploy/live.local /home/ce-dev/.composer/cache /home/ce-dev/.nvm/versions/node /home/ce-dev/.local/share/mkcert && \
   chown -R ce-dev:ce-dev /home/ce-dev && \
   chmod +x /usr/local/bin/*

From 51f6fcd52823f139ac97bbcbc2e2ead6949b1bae Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Wed, 25 Oct 2023 12:23:46 +0200
Subject: [PATCH 2/2] Noticed some extra references to buster.

---
 docker-images/dind/Dockerfile | 4 ++--
 docker-images/export.sh       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-images/dind/Dockerfile b/docker-images/dind/Dockerfile
index 513281d..3bc3bf2 100644
--- a/docker-images/dind/Dockerfile
+++ b/docker-images/dind/Dockerfile
@@ -9,11 +9,11 @@ RUN \
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
-  echo 'deb [arch=amd64] https://download.docker.com/linux/debian buster stable' > /etc/apt/sources.list.d/docker.list && \
+  echo 'deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable' > /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \
   apt-get install -y -o Dpkg::Options::="--force-confnew" docker-ce && \
   rm -rf /tmp/* && \
   rm -rf /var/lib/apt/lists/* && \
-  apt-get clean
\ No newline at end of file
+  apt-get clean
diff --git a/docker-images/export.sh b/docker-images/export.sh
index 7204c30..986e698 100755
--- a/docker-images/export.sh
+++ b/docker-images/export.sh
@@ -27,7 +27,7 @@ fi
 OWN_DIR=$( cd "$( dirname "$OWN" )" && pwd -P)
 
 # Ensure we have a fresh image to start with.
-docker image pull debian:buster
+docker image pull debian:bullseye
 
 # Build base image.
 echo "Building base image."