bump squid to 7.5

.github/FUNDING.yml

@@ -1 +1 @@
-custom: ['https://boosty.to/0xffff']
+custom: ['https://dalink.to/b4tman1', 'https://boosty.to/0xffff']

Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.23.3 as build
+FROM alpine:3.23.3 AS build
 
-ARG SQUID_VER=6.13
+ARG SQUID_VER=7.5
 
 RUN set -x && \
 	apk add --no-cache  \
@@ -98,9 +98,6 @@ RUN set -x && \
 	make -j $nproc && \
 	make install
 
-WORKDIR /tmp/build/tools/squidclient
-RUN make && make install-strip
-
 RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
 	echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
@@ -108,8 +105,8 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
 
 FROM alpine:3.23.3
 	
-ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
-ENV TZ Europe/Moscow
+ENV SQUID_CONFIG_FILE=/etc/squid/squid.conf
+ENV TZ=Europe/Moscow
 
 RUN set -x && \
 	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
@@ -120,13 +117,14 @@ RUN apk add --no-cache \
 		heimdal-libs \
 		libcap \
 		libltdl \
+		apache2-utils \
+		curl \
 		tzdata
 
 COPY --from=build /etc/squid/ /etc/squid/
 COPY --from=build /usr/lib/squid/ /usr/lib/squid/
 COPY --from=build /usr/share/squid/ /usr/share/squid/
 COPY --from=build /usr/sbin/squid /usr/sbin/squid
-COPY --from=build /usr/bin/squidclient /usr/bin/squidclient
 
 COPY --chmod=755 run.sh /
 

README.md

@@ -32,10 +32,19 @@ docker-compose up
 
 By default, the image now includes a local network allow-list (`/etc/squid/conf.d/localnet.conf`) so clients from RFC1918/RFC4193 ranges can connect without mounting an extra ACL file.
 
+The image also includes `apache2-utils`, so you can generate and manage `htpasswd` files directly in the container for basic authentication setups.
+
 
 ## Environment variables:
 
 - **SQUID_CONFIG_FILE**: Specify the configuration file for squid. Defaults to `/etc/squid/squid.conf`.
+- **TZ**: Override the container timezone (for example, `Europe/Berlin`).
+
+You can configure Squid in multiple ways:
+
+- Replace the main configuration file by overriding `SQUID_CONFIG_FILE`.
+- Add configuration snippets to `/etc/squid/conf.d`: all `*.conf` files from this directory are included at the **beginning** of the default configuration.
+- Add configuration snippets to `/etc/squid/conf.d.tail`: all `*.conf` files from this directory are included at the **end** of the default configuration.
 
 ## Example:
 

docker-compose.test.yml

@@ -1,9 +1,8 @@
-version: '2.3'
 services:
   proxy:
     image: "${TEST_TAG}"
     healthcheck:
-      test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"]
+      test: ["CMD", "sh", "-exc", "curl -s -o /dev/null --max-time 3 -w '%{http_code}' 'http://127.0.0.1:3128/squid-internal-mgr/info' 2> /dev/null | grep -qF '200'"]
       interval: 5s
       timeout: 3s
       retries: 5
@@ -14,5 +13,4 @@ services:
       - proxy
     depends_on:
       - proxy
-    command: sh -exc "sleep 10 && squidclient -h proxy -T 3 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200 OK'"
-
+    command: sh -exc "sleep 10 && curl --proxy='http://proxy:3128' -s -o /dev/null --max-time 3 -w '%{http_code}' 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200'"

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '2'
 services:
   squid:
     image: 'b4tman/squid'