Skip to content

Bullseye upgrade pr 1.x #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Nov 8, 2023
Merged

Bullseye upgrade pr 1.x #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f5edb5
Upgrading base container to bullseye-slim.
gregharvey Jul 18, 2023
60eced0
Merge branch '1.x' into bullseye_upgrade
gregharvey Jul 20, 2023
4cd5d28
Merge branch '1.x' into bullseye_upgrade
gregharvey Oct 25, 2023
51f6fcd
Noticed some extra references to buster.
gregharvey Oct 25, 2023
fadf3ad
Merge branch '1.x' into bullseye_upgrade-PR-1.x
gregharvey Oct 25, 2023
1c34798
Merge branch 'bullseye_upgrade' into bullseye_upgrade-PR-1.x
gregharvey Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker-images/dind/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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