dockerhub login for build in drone cloud

https://discourse.drone.io/t/how-to-prevent-dockerhub-pull-rate-limit-errors/8324

.drone.yml

@@ -17,16 +17,20 @@ steps:
     username: b4tman
     password:
       from_secret: docker_password
+    config:
+      from_secret: docker_config
 - name: squid-armhf image for github packages
   image: plugins/docker
   settings:
-    repo: docker.pkg.github.com/b4tman/docker-squid/squid-armhf
+    repo: ghcr.io/b4tman/squid-armhf
     auto_tag: true
     pull_image: true
-    registry: docker.pkg.github.com
+    registry: ghcr.io
     username: b4tman
     password:
       from_secret: github_password
+    config:
+      from_secret: docker_config
 trigger:
   ref:
   - refs/tags/**

.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.12.0 as build
+FROM alpine:3.13.5 as build
 
-ENV SQUID_VER 4.13
+ENV SQUID_VER 4.15
 ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
 
 RUN set -x && \
@@ -93,16 +93,18 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid
 
+
 RUN set -x && \
 	cd /tmp/build && \
-	nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
+	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
+	make install && \
+	cd tools/squidclient && make && make install-strip
 
-FROM alpine:3.12.0
+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.5
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -123,6 +125,8 @@ 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,5 +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/build/b4tman/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'"