build for arm64 (#77)

.drone.yml

@@ -1,17 +1,17 @@
 ---
 kind: pipeline
 type: docker
-name: arm32 images
+name: arm64 images
 platform:
   os: linux
-  arch: arm
+  arch: arm64
 steps:
 - name: squid image for dockerhub
   image: plugins/docker
   settings:
     repo: docker.io/b4tman/squid
     auto_tag: true
-    auto_tag_suffix: armhf
+    auto_tag_suffix: arm64
     pull_image: true
     registry: docker.io
     username: b4tman
@@ -19,10 +19,10 @@ steps:
       from_secret: docker_password
     config:
       from_secret: docker_config
-- name: squid-armhf image for github packages
+- name: squid-arm64 image for github packages
   image: plugins/docker
   settings:
-    repo: ghcr.io/b4tman/squid-armhf
+    repo: ghcr.io/b4tman/squid-arm64
     auto_tag: true
     pull_image: true
     registry: ghcr.io

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: ['https://boosty.to/0xffff', 'https://www.donationalerts.com/r/b4tman1']

.github/workflows/dockerimage.yml

@@ -4,8 +4,7 @@ on:
   push:
     # Publish `master` as Docker `latest` image.
     branches:
-      - master
+      - master
-      - v5
 
     # Publish `v1.2.3` tags as releases.
     tags:
@@ -16,30 +15,27 @@ on:
     branches:
       - "master"
 
-env:
-  TEST_TAG: b4tman/squid:test
-
 jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: b4tman
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Cache Docker layers
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -47,14 +43,14 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build squid image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
           context: .
           push: false
-          load: true # automatically load the single-platform build result to docker images
+          tags: b4tman/squid
-          tags: ${{ env.TEST_TAG }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
+          outputs: type=image,name=b4tman/squid,push=false
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -65,24 +61,17 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
       - name: Test image
-        run: |
+        run: docker-compose -f docker-compose.test.yml up sut
-          set -ex
-          docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
-          docker compose -f docker-compose.test.yml down
 
-      - name: set base image for 'ssl-bump'
-        run: |
-          sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile
-      
       - name: Build 'ssl-bump' image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
-          context: .
+          context: ssl-bump
           push: false
-          load: true
+          file: ssl-bump/Dockerfile
-          tags: ${{ env.TEST_TAG }}-ssl-bump
+          tags: b4tman/squid:ssl-bump
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -91,22 +80,17 @@ jobs:
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-          
+
-      - name: Test 'ssl-bump' image
-        run: |
-          set -ex
-          TEST_TAG="${TEST_TAG}-ssl-bump" docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
-          docker compose -f docker-compose.test.yml down
   push:
     needs: test
     runs-on: ubuntu-20.04
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: |
             b4tman/squid
@@ -120,7 +104,7 @@ jobs:
 
       - name: Docker meta (ssl-bump)
         id: meta_ssl_bump
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: |
             b4tman/squid
@@ -135,7 +119,7 @@ jobs:
 
       - name: Docker meta (ssl-bump ghcr)
         id: meta_ssl_bump_ghcr
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: |
             ghcr.io/b4tman/squid-ssl-bump
@@ -147,13 +131,13 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v4.2.0
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -161,20 +145,20 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           username: b4tman
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GHCR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
 
       - name: Build squid image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
           context: .
           push: true
@@ -182,7 +166,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252
@@ -193,7 +177,7 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
       - name: Build 'ssl-bump' image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
           context: ssl-bump
           push: true
@@ -213,7 +197,7 @@ jobs:
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
       - name: Build 'ssl-bump' image for ghcr
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v2
         with:
           context: ssl-bump
           push: true
@@ -222,7 +206,7 @@ jobs:
           tags: ${{ steps.meta_ssl_bump_ghcr.outputs.tags }}
           labels: ${{ steps.meta_ssl_bump_ghcr.outputs.labels }}
           cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+          cache-to: type=local,dest=/tmp/.buildx-cache-new
 
       # Temp fix
       # https://github.com/docker/build-push-action/issues/252

.github/workflows/stale.yml

@@ -1,28 +0,0 @@
-# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
-#
-# You can adjust the behavior by modifying this file.
-# For more information, see:
-# https://github.com/actions/stale
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: '0 1 * * *'
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-
-    steps:
-    - uses: actions/stale@v9
-      with:
-        days-before-stale: 182
-        days-before-close: 7
-        stale-issue-message: 'Marking stale due to inactivity. Remove stale label or comment or this will be closed in 7 days.'
-        close-issue-message: 'Closing due to inactivity.'
-        stale-pr-message: 'Marking stale due to inactivity. Remove stale label or comment or this will be closed in 7 days.'
-        close-pr-message: 'Closing due to inactivity.'

Dockerfile

@@ -1,6 +1,11 @@
-FROM alpine:3.21.2 as build
+FROM alpine:3.14.0 as build
 
-ARG SQUID_VER=6.13
+ENV SQUID_VER 4.16
+
+# fix conflict with libretls and libressl
+RUN set -x && \
+	apk add --no-cache libretls && \
+	apk upgrade --no-cache libretls
 
 RUN set -x && \
 	apk add --no-cache  \
@@ -9,8 +14,7 @@ RUN set -x && \
 		libc-dev \
 		curl \
 		gnupg \
-		openssl-dev \
+		libressl-dev \
-		openssl-libs-static \
 		perl-dev \
 		autoconf \
 		automake \
@@ -21,33 +25,32 @@ RUN set -x && \
 		libcap-dev \
 		linux-headers
 
-WORKDIR /tmp/build
+RUN set -x && \
+	mkdir -p /tmp/build && \
+	cd /tmp/build && \
+    curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
+	curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc
+
+COPY squid-keys.asc /tmp
 
 RUN set -x && \
-	curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.gz" -o squid-${SQUID_VER}.tar.gz && \
+	cd /tmp/build && \
-	curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.gz.asc" -o squid-${SQUID_VER}.tar.gz.asc
+	export GNUPGHOME="$(mktemp -d)" && \
-
+	gpg --import /tmp/squid-keys.asc && \
-COPY squid-keys.asc /tmp/build
-
-RUN set -x && \
-	GNUPGHOME="$(mktemp -d)" && \
-	export GNUPGHOME && \
-	gpg --import squid-keys.asc && \
 	gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
 	rm -rf "$GNUPGHOME"
-
+	
 RUN set -x && \
+	cd /tmp/build && \	
 	tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
 	\
-	MACHINE=$(uname -m) && \
-	\
 	CFLAGS="-g0 -O2" \
 	CXXFLAGS="-g0 -O2" \
 	LDFLAGS="-s" \
 	\
 	./configure \
-		--build="$MACHINE" \
+		--build="$(uname -m)" \
-		--host="$MACHINE" \
+		--host="$(uname -m)" \
 		--prefix=/usr \
 		--datadir=/usr/share/squid \
 		--sysconfdir=/etc/squid \
@@ -58,8 +61,7 @@ RUN set -x && \
 		--disable-arch-native \
 		--enable-removal-policies="lru,heap" \
 		--enable-auth-digest \
-		--enable-auth-basic="getpwnam,NCSA,DB,RADIUS" \
+		--enable-auth-basic="getpwnam,NCSA" \
-		--enable-basic-auth-helpers="DB" \
 		--enable-epoll \
 		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
 		--enable-auth-ntlm="fake" \
@@ -86,27 +88,25 @@ RUN set -x && \
 		--enable-storeio="diskd rock" \
 		--enable-ipv6 \
 		--enable-translation \
-		--enable-snmp \
+		--disable-snmp \
 		--disable-dependency-tracking \
 		--with-large-files \
 		--with-default-user=squid \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid
 
+
 RUN set -x && \
-	nproc=$(n=$(nproc) ; max_n=6 ; echo $(( n <= max_n ? n : max_n )) ) && \
+	cd /tmp/build && \
+	nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
 	make -j $nproc && \
-	make install
+	make install && \
+	cd tools/squidclient && make && make install-strip
 
-WORKDIR /tmp/build/tools/squidclient
+RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
-RUN make && make install-strip
+RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
 
-RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
+FROM alpine:3.14.0
-	echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
-
-# --- --- --- --- --- --- --- --- ---
-
-FROM alpine:3.21.2
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -115,35 +115,46 @@ RUN set -x && \
 	deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
 	addgroup -S squid -g 3128 && adduser -S -u 3128 -G squid -g squid -H -D -s /bin/false -h /var/cache/squid squid
 
+# fix conflict with libretls and libressl
+RUN set -x && \
+	apk add --no-cache libretls && \
+	apk upgrade --no-cache libretls
+
 RUN apk add --no-cache \
 		libstdc++ \
 		heimdal-libs \
 		libcap \
-		libltdl \
+		libressl3.3-libcrypto \
-		tzdata
+		libressl3.3-libssl \
+		libltdl	
 
 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 /
 
+		
 RUN install -d -o squid -g squid \
 		/var/cache/squid \
 		/var/log/squid \
 		/var/run/squid && \
-	chmod +x /usr/lib/squid/* && \
+	chmod +x /usr/lib/squid/*
-	install -d -m 755 -o squid -g squid \
+	
+RUN install -d -m 755 -o squid -g squid \
 		/etc/squid/conf.d \
-		/etc/squid/conf.d.tail && \
+		/etc/squid/conf.d.tail
-	touch /etc/squid/conf.d/placeholder.conf
+RUN touch /etc/squid/conf.d/placeholder.conf 
 COPY squid-log.conf /etc/squid/conf.d.tail/
 
-VOLUME ["/var/cache/squid"]
+RUN	set -x && \
+	apk add --no-cache --virtual .tz alpine-conf tzdata && \ 
+	/sbin/setup-timezone -z $TZ && \
+	apk del .tz 	
+	
+VOLUME ["/var/cache/squid"]	
 EXPOSE 3128/tcp
 
 USER squid
 
-CMD ["/run.sh"]
+CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]

README.md

@@ -1,3 +1,5 @@
+[![Drone Build Status](https://cloud.drone.io/api/badges/b4tman/docker-squid/status.svg?ref=refs/heads/master)](https://cloud.drone.io/b4tman/docker-squid)
+![Docker Build Status](https://img.shields.io/docker/cloud/build/b4tman/squid)
 ![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
 
 # docker-squid

docker-compose.test.yml

@@ -1,9 +1,10 @@
 version: '2.3'
 services:
   proxy:
-    image: "${TEST_TAG}"
+    image: squidproxy
-    volumes:
+    build:
-      - './test_localnet.conf:/etc/squid/conf.d/test_localnet.conf:ro'
+      context: .
+      dockerfile: Dockerfile
     healthcheck:
       test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"]
       interval: 5s
@@ -11,10 +12,9 @@ services:
       retries: 5
       start_period: 1s
   sut:
-    image: "${TEST_TAG}"
+    image: squidproxy
     links: 
       - 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'"
-

run.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -x
-
-# force remove pid
-if [ -e /var/run/squid/squid.pid ]; then
-	rm -f /var/run/squid/squid.pid
-fi
-
-# init cache
-/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
-
-# run squid
-exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1

ssl-bump/Dockerfile

@@ -1,9 +1,4 @@
 FROM b4tman/squid
 
-COPY run.sh /
 USER root
-RUN chmod 755 /run.sh
+CMD ["sh", "-c", "(test -d /var/cache/squid/ssl_db || /usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB) && /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
-
-USER squid
-
-CMD ["/run.sh"]

ssl-bump/run.sh

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -x
-
-# init ssl_db
-if [ ! -d /var/cache/squid/ssl_db ]; then
-	/usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB
-fi
-
-# init cache
-/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
-
-# run squid
-exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1

test_localnet.conf

@@ -1,11 +0,0 @@
-acl localnet1 src 0.0.0.1-0.255.255.255 # RFC 1122 "this" network (LAN)
-acl localnet1 src 10.0.0.0/8            # RFC 1918 local private network (LAN)
-acl localnet1 src 100.64.0.0/10         # RFC 6598 shared address space (CGN)
-acl localnet1 src 169.254.0.0/16        # RFC 3927 link-local (directly plugged) machines
-acl localnet1 src 172.16.0.0/12         # RFC 1918 local private network (LAN)
-acl localnet1 src 192.168.0.0/16                # RFC 1918 local private network (LAN)
-acl localnet1 src fc00::/7              # RFC 4193 local private network range
-acl localnet1 src fe80::/10             # RFC 4291 link-local (directly plugged) machines
-
-http_access allow localnet1
-http_access allow localhost manager