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/workflows/dockerimage.yml

@@ -19,7 +19,7 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -35,7 +35,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Cache Docker layers
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -49,7 +49,7 @@ jobs:
           push: false
           tags: b4tman/squid
           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
@@ -71,7 +71,7 @@ jobs:
           file: ssl-bump/Dockerfile
           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
@@ -86,7 +86,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
 
       - name: Docker meta
         id: meta
@@ -137,7 +137,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
 
       - name: Cache Docker layers
-        uses: actions/cache@v3.0.2
+        uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -166,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
@@ -206,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@v5
-      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.15.4 as build
+FROM alpine:3.14.0 as build
 
-ENV SQUID_VER 5.5
+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  \
@@ -56,8 +61,7 @@ RUN set -x && \
 		--disable-arch-native \
 		--enable-removal-policies="lru,heap" \
 		--enable-auth-digest \
-		--enable-auth-basic="getpwnam,NCSA,DB" \
-		--enable-basic-auth-helpers="DB" \
+		--enable-auth-basic="getpwnam,NCSA" \
 		--enable-epoll \
 		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
 		--enable-auth-ntlm="fake" \
@@ -91,10 +95,6 @@ RUN set -x && \
 		--with-openssl \
 		--with-pidfile=/var/run/squid/squid.pid
 
-# fix build
-RUN set -x && \
-    mkdir -p /tmp/build/tools/squidclient/tests && \
-    mkdir -p /tmp/build/tools/tests
 
 RUN set -x && \
 	cd /tmp/build && \
@@ -106,7 +106,7 @@ RUN set -x && \
 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.15.4
+FROM alpine:3.14.0
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -115,12 +115,17 @@ 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 \
-		libressl3.4-libcrypto \
-		libressl3.4-libssl \
+		libressl3.3-libcrypto \
+		libressl3.3-libssl \
 		libltdl	
 
 COPY --from=build /etc/squid/ /etc/squid/