mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-09-04 00:17:30 +00:00
Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
0fd6d1f258 | |||
178974b0df | |||
2eea5bc28f | |||
2ba626f10a | |||
|
f9e3532674 | ||
|
79c4b13210 | ||
b1a8f65fe3 | |||
02094e50e2 | |||
411b922800 | |||
|
92cf56c414 | ||
029f8e55aa | |||
3895aba33e | |||
685eeddf3e
|
|||
1075790c45
|
|||
9d7abf3dea
|
|||
3ce1d078b7
|
|||
ab6974f7b7
|
10
.drone.yml
10
.drone.yml
@@ -1,17 +1,17 @@
|
|||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: arm64 images
|
name: arm32 images
|
||||||
platform:
|
platform:
|
||||||
os: linux
|
os: linux
|
||||||
arch: arm64
|
arch: arm
|
||||||
steps:
|
steps:
|
||||||
- name: squid image for dockerhub
|
- name: squid image for dockerhub
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
repo: docker.io/b4tman/squid
|
repo: docker.io/b4tman/squid
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
auto_tag_suffix: arm64
|
auto_tag_suffix: armhf
|
||||||
pull_image: true
|
pull_image: true
|
||||||
registry: docker.io
|
registry: docker.io
|
||||||
username: b4tman
|
username: b4tman
|
||||||
@@ -19,10 +19,10 @@ steps:
|
|||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
config:
|
config:
|
||||||
from_secret: docker_config
|
from_secret: docker_config
|
||||||
- name: squid-arm64 image for github packages
|
- name: squid-armhf image for github packages
|
||||||
image: plugins/docker
|
image: plugins/docker
|
||||||
settings:
|
settings:
|
||||||
repo: ghcr.io/b4tman/squid-arm64
|
repo: ghcr.io/b4tman/squid-armhf
|
||||||
auto_tag: true
|
auto_tag: true
|
||||||
pull_image: true
|
pull_image: true
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
|
28
.github/workflows/stale.yml
vendored
Normal file
28
.github/workflows/stale.yml
vendored
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
# 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@v4
|
||||||
|
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.'
|
27
Dockerfile
27
Dockerfile
@@ -1,11 +1,6 @@
|
|||||||
FROM alpine:3.14.0 as build
|
FROM alpine:3.15.0 as build
|
||||||
|
|
||||||
ENV SQUID_VER 4.16
|
ENV SQUID_VER 5.4
|
||||||
|
|
||||||
# fix conflict with libretls and libressl
|
|
||||||
RUN set -x && \
|
|
||||||
apk add --no-cache libretls && \
|
|
||||||
apk upgrade --no-cache libretls
|
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
@@ -61,7 +56,8 @@ RUN set -x && \
|
|||||||
--disable-arch-native \
|
--disable-arch-native \
|
||||||
--enable-removal-policies="lru,heap" \
|
--enable-removal-policies="lru,heap" \
|
||||||
--enable-auth-digest \
|
--enable-auth-digest \
|
||||||
--enable-auth-basic="getpwnam,NCSA" \
|
--enable-auth-basic="getpwnam,NCSA,DB" \
|
||||||
|
--enable-basic-auth-helpers="DB" \
|
||||||
--enable-epoll \
|
--enable-epoll \
|
||||||
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
|
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
|
||||||
--enable-auth-ntlm="fake" \
|
--enable-auth-ntlm="fake" \
|
||||||
@@ -95,6 +91,10 @@ RUN set -x && \
|
|||||||
--with-openssl \
|
--with-openssl \
|
||||||
--with-pidfile=/var/run/squid/squid.pid
|
--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 && \
|
RUN set -x && \
|
||||||
cd /tmp/build && \
|
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 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
|
RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
|
||||||
|
|
||||||
FROM alpine:3.14.0
|
FROM alpine:3.15.0
|
||||||
|
|
||||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||||
ENV TZ Europe/Moscow
|
ENV TZ Europe/Moscow
|
||||||
@@ -115,17 +115,12 @@ RUN set -x && \
|
|||||||
deluser squid 2>/dev/null; delgroup squid 2>/dev/null; \
|
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
|
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 \
|
RUN apk add --no-cache \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
heimdal-libs \
|
heimdal-libs \
|
||||||
libcap \
|
libcap \
|
||||||
libressl3.3-libcrypto \
|
libressl3.4-libcrypto \
|
||||||
libressl3.3-libssl \
|
libressl3.4-libssl \
|
||||||
libltdl
|
libltdl
|
||||||
|
|
||||||
COPY --from=build /etc/squid/ /etc/squid/
|
COPY --from=build /etc/squid/ /etc/squid/
|
||||||
|
Reference in New Issue
Block a user