From b734fb80ab37ddba2727e5236b9a12ccd214dc7f Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 14 Jun 2023 14:29:06 +0000 Subject: [PATCH 1/5] Migrate to deb12 (bookworm) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ce0d827..1d730eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM debian:bullseye-slim as buildsquid +FROM debian:bookworm-slim as buildsquid ARG SQUID_VERSION ENV ENV_SQUID_VERSION=$SQUID_VERSION WORKDIR /tmp -RUN echo "deb-src http://deb.debian.org/debian bullseye main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-upgrade --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl1.1 winbind \ +RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-upgrade --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl1.1 winbind \ && wget --progress=dot:giga http://www.squid-cache.org/Versions/v5/$SQUID_VERSION \ && tar -C /tmp --strip-components=1 -xzf $SQUID_VERSION \ && ./configure \ From 15043c4c6a1ffb479492a8623e9c9c9f27b3ebe8 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 14 Jun 2023 14:35:30 +0000 Subject: [PATCH 2/5] Update libssl --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d730eb..043fd77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM debian:bookworm-slim as buildsquid ARG SQUID_VERSION ENV ENV_SQUID_VERSION=$SQUID_VERSION WORKDIR /tmp -RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-upgrade --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl1.1 winbind \ +RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-upgrade --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl3 winbind \ && wget --progress=dot:giga http://www.squid-cache.org/Versions/v5/$SQUID_VERSION \ && tar -C /tmp --strip-components=1 -xzf $SQUID_VERSION \ && ./configure \ From de7abbd44ae21da6f3efbc5d4cbca7da6dc3d586 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 14 Jun 2023 14:36:12 +0000 Subject: [PATCH 3/5] Update libssl From ed46fb549f48f11e92dc4acd087873e896617710 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 14 Jun 2023 15:03:29 +0000 Subject: [PATCH 4/5] Update to deb12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 043fd77..5d6cf2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN echo "deb-src http://deb.debian.org/debian bookworm main contrib" >> /etc/ap && find /tmp/ -type f -name "Makefil*" -delete \ && find /tmp/ -type f -name "*.in" -delete # Install -FROM debian:bullseye-slim +FROM debian:bookworm-slim COPY --from=buildsquid --chown=1161 /tmp/src/auth/basic/LDAP/basic_ldap_auth /usr/lib/squid/ COPY --from=buildsquid --chown=1161 /tmp/src/auth/digest/LDAP/digest_ldap_auth /usr/lib/squid/ COPY --from=buildsquid --chown=1161 /tmp/src/auth/negotiate/kerberos/negotiate_kerberos_auth /usr/lib/squid/ From cd473349143db652eb8ee646ec6367d04e4417b7 Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 14 Jun 2023 15:15:17 +0000 Subject: [PATCH 5/5] Update libldap for deb12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d6cf2a..03f155c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -101,7 +101,7 @@ RUN adduser --no-create-home --uid 1161 --group --system squid \ # Removed in 5.8, needed for test && sed -i '/http_access deny all/ihttp_access allow localnet' /etc/squid/squid.conf \ # Packages dependencies installation for running and clean again - && apt-get update && apt-get install -y --no-install-recommends c-icap ca-certificates net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-2.4-2 libecap3 libcap2 libdb5.3 libatomic1 dumb-init procps inotify-tools curl \ + && apt-get update && apt-get install -y --no-install-recommends c-icap ca-certificates net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-common libecap3 libcap2 libdb5.3 libatomic1 dumb-init procps inotify-tools curl \ && apt-get auto-remove -y && apt-get clean autoclean \ && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* COPY --chown=1161 squid /squid