bump to 4.13

err:
"Registry credentials or Docker config not provided. Guest mode enabled."

.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: docker.pkg.github.com/b4tman/docker-squid/squid-armhf
+    auto_tag: true
+    pull_image: true
+    registry: docker.pkg.github.com
+    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

@@ -19,13 +19,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
-    - name: Checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-    
     - name: Build squid image
       run: docker build . --file Dockerfile --tag b4tman/squid
     
@@ -42,13 +35,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
-    - name: Checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-    
     - name: Build squid image
       run: docker build . --file Dockerfile --tag b4tman/squid
     

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "squid"]
-	path = squid
-	url = https://github.com/squid-cache/squid
-	branch = v5

Dockerfile

@@ -1,4 +1,7 @@
-FROM alpine:3.11.3 as build
+FROM alpine:3.12.0 as build
+
+ENV SQUID_VER 4.13
+ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \
 	apk add --no-cache  \
@@ -18,15 +21,27 @@ RUN set -x && \
 		libcap-dev \
 		linux-headers
 
-COPY squid /tmp/build
-WORKDIR /tmp/build/
-
-RUN sed -i 's/ed -s/ed/g' bootstrap.sh
-RUN ln -s /usr/bin/aclocal-1.16 /usr/bin/aclocal-1.15
-RUN ln -s /usr/bin/automake-1.16 /usr/bin/automake-1.15
-RUN sh bootstrap.sh
-
-RUN \
+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
+	
+RUN set -x && \
+	cd /tmp/build && \
+	export GNUPGHOME="$(mktemp -d)" && \
+	( \
+	 gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${SQUID_SIG_KEY} || \
+     gpg --keyserver hkp://ipv4.pool.sks-keyservers.net   --recv-keys ${SQUID_SIG_KEY} ||  \
+     gpg --keyserver hkp://pgp.mit.edu:80                 --recv-keys ${SQUID_SIG_KEY} \
+	) && \
+	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 && \
+	\
 	CFLAGS="-g0 -O2" \
 	CXXFLAGS="-g0 -O2" \
 	LDFLAGS="-s" \
@@ -48,7 +63,7 @@ RUN \
 		--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 \
@@ -79,13 +94,15 @@ RUN \
 		--with-pidfile=/var/run/squid/squid.pid
 
 RUN set -x && \
-	make -j $(grep -cs ^processor /proc/cpuinfo) && \
+	cd /tmp/build && \
+	nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
+	make -j $nproc && \
 	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
 
-FROM alpine:3.11.3
+FROM alpine:3.12.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -98,8 +115,8 @@ 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/

README.md

@@ -1,5 +1,4 @@
-[![](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)
+[![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/build/b4tman/squid)
 ![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
 

hooks/post_checkout

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-git submodule update --init
-