bump squid to 4.14

Bumps alpine from 3.12.3 to 3.13.1.

Signed-off-by: dependabot[bot] <support@github.com>

.drone.yml

@@ -0,0 +1,33 @@
+---
+kind: pipeline
+type: docker
+name: arm32 images
+platform:
+  os: linux
+  arch: arm
+steps:
+- name: squid image for dockerhub
+  image: plugins/docker
+  settings:
+    repo: docker.io/b4tman/squid
+    auto_tag: true
+    auto_tag_suffix: armhf
+    pull_image: true
+    registry: docker.io
+    username: b4tman
+    password:
+      from_secret: docker_password
+- name: squid-armhf image for github packages
+  image: plugins/docker
+  settings:
+    repo: ghcr.io/b4tman/squid-armhf
+    auto_tag: true
+    pull_image: true
+    registry: ghcr.io
+    username: b4tman
+    password:
+      from_secret: github_password
+trigger:
+  ref:
+  - refs/tags/**
+  - refs/heads/master

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: docker
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: '02:00'
+  open-pull-requests-limit: 10

.github/workflows/dockerimage.yml

@@ -42,11 +42,11 @@ jobs:
       run: docker build ssl-bump --tag b4tman/squid:ssl-bump
     
     - name: Log into registry
-      run: echo "${{ secrets.GITHUB_PKGS_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
+      run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
     
     - name: Push squid image
       run: |
-        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/squid
+        IMAGE_ID=ghcr.io/${{ github.actor }}/squid
       
         # Strip git ref prefix from version
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
@@ -65,7 +65,7 @@ jobs:
     
     - name: Push 'ssl-bump' image
       run: |
-        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/ssl-bump
+        IMAGE_ID=ghcr.io/${{ github.actor }}/squid-ssl-bump
       
         # Strip git ref prefix from version
         VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')

Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.11.3 as build
+FROM alpine:3.13.1 as build
 
-ENV SQUID_VER 4.10
+ENV SQUID_VER 4.14
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \
@@ -63,7 +63,7 @@ RUN set -x && \
 		--enable-epoll \
 		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
 		--enable-auth-ntlm="fake" \
-		--enable-auth-negotiate="wrapper" \
+		--enable-auth-negotiate="kerberos,wrapper" \
 		--enable-silent-rules \
 		--disable-mit \
 		--enable-heimdal \
@@ -93,15 +93,18 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid
 
+
 RUN set -x && \
 	cd /tmp/build && \
-	make -j $(grep -cs ^processor /proc/cpuinfo) && \
-	make install
-
-RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
-RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
+	nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
+	make -j $nproc && \
+	make install && \
+	cd tools/squidclient && make && make install-strip
 
-FROM alpine:3.11.3
+RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
+RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
+
+FROM alpine:3.13.1
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -114,14 +117,16 @@ RUN apk add --no-cache \
 		libstdc++ \
 		heimdal-libs \
 		libcap \
-		libressl3.0-libcrypto \
-		libressl3.0-libssl \
+		libressl3.1-libcrypto \
+		libressl3.1-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
+
 		
 RUN install -d -o squid -g squid \
 		/var/cache/squid \

README.md

@@ -1,6 +1,5 @@
-[![](https://images.microbadger.com/badges/image/b4tman/squid.svg)](https://microbadger.com/images/b4tman/squid "Get your own image badge on microbadger.com")
-[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=b4tman/docker-squid)](https://dependabot.com)
-![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
+[![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,11 +1,20 @@
-version: '2'
+version: '2.3'
 services:
   proxy:
-    build: .
+    image: squidproxy
+    build:
+      context: .
+      dockerfile: Dockerfile
+    healthcheck:
+      test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"]
+      interval: 5s
+      timeout: 3s
+      retries: 5
+      start_period: 1s
   sut:
-    image: alpine:3.10.1
+    image: squidproxy
     links: 
       - proxy
     depends_on:
       - proxy
-    command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"
+    command: sh -exc "sleep 10 && squidclient -h proxy -T 3 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200 OK'"