remove workflow "Docker Image CI"

# Conflicts:
#	Dockerfile
#	README.md

.drone.yml

@@ -1,33 +0,0 @@
----
-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/workflows/dockerimage.yml

@@ -1,83 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    # Publish `master` as Docker `latest` image.
-    branches:
-      - master
-    
-    # Publish `v1.2.3` tags as releases.
-    tags:
-      - v*
-  
-  # Run tests for any PRs.
-  pull_request:
-  
-jobs:
-  test: 
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: Build squid image
-      run: docker build . --file Dockerfile --tag b4tman/squid
-    
-    - name: Test image
-      run: docker-compose -f docker-compose.test.yml up sut
-    
-    - name: Build 'ssl-bump' image
-      run: docker build ssl-bump --tag b4tman/squid:ssl-bump
-  
-  push:
-    needs: test
-    runs-on: ubuntu-18.04
-    if: github.event_name == 'push'
-    steps:
-    - uses: actions/checkout@v2
-    
-    - name: Build squid image
-      run: docker build . --file Dockerfile --tag b4tman/squid
-    
-    - name: Build 'ssl-bump' image
-      run: docker build ssl-bump --tag b4tman/squid:ssl-bump
-    
-    - name: Log into registry
-      run: echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-    
-    - name: Push squid image
-      run: |
-        IMAGE_ID=ghcr.io/${{ github.actor }}/squid
-      
-        # Strip git ref prefix from version
-        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-      
-        # Strip "v" prefix from tag name
-        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-      
-        # Use Docker `latest` tag convention
-        [ "$VERSION" == "master" ] && VERSION=latest
-      
-        echo IMAGE_ID=$IMAGE_ID
-        echo VERSION=$VERSION
-      
-        docker tag b4tman/squid $IMAGE_ID:$VERSION
-        docker push $IMAGE_ID:$VERSION
-    
-    - name: Push 'ssl-bump' image
-      run: |
-        IMAGE_ID=ghcr.io/${{ github.actor }}/squid-ssl-bump
-      
-        # Strip git ref prefix from version
-        VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-      
-        # Strip "v" prefix from tag name
-        [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-      
-        # Use Docker `latest` tag convention
-        [ "$VERSION" == "master" ] && VERSION=latest
-      
-        echo IMAGE_ID=$IMAGE_ID
-        echo VERSION=$VERSION
-      
-        docker tag b4tman/squid:ssl-bump $IMAGE_ID:$VERSION
-        docker push $IMAGE_ID:$VERSION

Dockerfile

@@ -1,6 +1,6 @@
-FROM alpine:3.13.1 as build
+FROM --platform=linux/armhf alpine:3.12.0 as build
 
-ENV SQUID_VER 4.14
+ENV SQUID_VER 4.12
 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="kerberos,wrapper" \
+		--enable-auth-negotiate="wrapper" \
 		--enable-silent-rules \
 		--disable-mit \
 		--enable-heimdal \
@@ -93,18 +93,15 @@ 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) && \
+	make -j $(grep -cs ^processor /proc/cpuinfo) && \
-	make -j $nproc && \
+	make install
-	make install && \
-	cd tools/squidclient && make && make install-strip
 
 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
+FROM --platform=linux/armhf alpine:3.12.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -125,8 +122,6 @@ 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,6 @@
-[![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)
+[![](https://images.microbadger.com/badges/image/b4tman/squid:armhf.svg)](https://microbadger.com/images/b4tman/squid:armhf "Get your own image badge on microbadger.com")
-![Docker Build Status](https://img.shields.io/docker/cloud/build/b4tman/squid)
+[![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)
 ![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
 
 # docker-squid

docker-compose.test.yml

@@ -1,20 +1,11 @@
-version: '2.3'
+version: '2'
 services:
   proxy:
-    image: squidproxy
+    build: .
-    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: squidproxy
+    image: alpine:3.10.1
     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'"
+    command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   squid:
-    image: 'b4tman/squid'
+    image: 'b4tman/squid:armhf'
     container_name: 'my-squid'
     restart: always
     ports:

ssl-bump/Dockerfile

@@ -1,4 +1,4 @@
-FROM b4tman/squid
+FROM b4tman/squid:armhf
 
 USER root
 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"]