NgTech-LTD/fredbcode-images-squid
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'freddev' into 'master'

Browse Source 
Migrate to deb12 (bookworm)

See merge request fredbcode-images/squid!20
This commit is contained in:
Fred 2023-06-15 11:09:34 +00:00
commit 930c254122
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -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 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 \
@ -58,7 +58,7 @@ RUN echo "deb-src http://deb.debian.org/debian bullseye 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/
@ -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