Skip to content

Commit

Permalink
Merge branch 'bullseye_upgrade' into bullseye_upgrade-PR-1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
gregharvey committed Oct 25, 2023
2 parents fadf3ad + 51f6fcd commit 1c34798
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker-images/dind/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
apt-get clean
2 changes: 1 addition & 1 deletion docker-images/export.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down

0 comments on commit 1c34798

Please sign in to comment.