mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-07-31 16:23:32 +00:00
Compare commits
25 Commits
v5.8.0
...
0f8b8450c4
Author | SHA1 | Date | |
---|---|---|---|
|
0f8b8450c4 | ||
|
a9d2a11911 | ||
|
a9042a350a | ||
|
558b4f3518 | ||
|
b209dc2c5b | ||
|
20ba07b326 | ||
b077ec9b09 | |||
f35cfdf194 | |||
2a86036919
|
|||
|
2d0d3bd90c | ||
1d71370e48 | |||
e108ff41f6
|
|||
e7d7016018
|
|||
a89c6b2878 | |||
9f260deb7f | |||
94cc9e2244 | |||
83cd331a0b | |||
|
1e0e16e157 | ||
6b980db7c7 | |||
2d8a60d962 | |||
|
dabb437ea8 | ||
494e411d43 | |||
|
d91a5600a9 | ||
|
8781714110 | ||
|
083adc0c03 |
25
.github/workflows/dockerimage.yml
vendored
25
.github/workflows/dockerimage.yml
vendored
@@ -4,7 +4,8 @@ on:
|
||||
push:
|
||||
# Publish `master` as Docker `latest` image.
|
||||
branches:
|
||||
- master
|
||||
- master
|
||||
- v5
|
||||
|
||||
# Publish `v1.2.3` tags as releases.
|
||||
tags:
|
||||
@@ -22,23 +23,23 @@ jobs:
|
||||
test:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to DockerHub
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: b4tman
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.2.6
|
||||
uses: actions/cache@v3.3.2
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -76,7 +77,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
@@ -121,13 +122,13 @@ jobs:
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
uses: docker/setup-qemu-action@v3
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v2
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.2.6
|
||||
uses: actions/cache@v3.3.2
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -135,13 +136,13 @@ jobs:
|
||||
${{ runner.os }}-buildx-
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: b4tman
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Login to GHCR
|
||||
uses: docker/login-action@v2
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
|
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v7
|
||||
- uses: actions/stale@v8
|
||||
with:
|
||||
days-before-stale: 182
|
||||
days-before-close: 7
|
||||
|
12
Dockerfile
12
Dockerfile
@@ -1,6 +1,6 @@
|
||||
FROM alpine:3.17.2 as build
|
||||
FROM alpine:3.18.4 as build
|
||||
|
||||
ARG SQUID_VER=5.8
|
||||
ARG SQUID_VER=6.3
|
||||
|
||||
RUN set -x && \
|
||||
apk add --no-cache \
|
||||
@@ -58,7 +58,7 @@ RUN set -x && \
|
||||
--disable-arch-native \
|
||||
--enable-removal-policies="lru,heap" \
|
||||
--enable-auth-digest \
|
||||
--enable-auth-basic="getpwnam,NCSA,DB" \
|
||||
--enable-auth-basic="getpwnam,NCSA,DB,RADIUS" \
|
||||
--enable-basic-auth-helpers="DB" \
|
||||
--enable-epoll \
|
||||
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
|
||||
@@ -86,7 +86,7 @@ RUN set -x && \
|
||||
--enable-storeio="diskd rock" \
|
||||
--enable-ipv6 \
|
||||
--enable-translation \
|
||||
--disable-snmp \
|
||||
--enable-snmp \
|
||||
--disable-dependency-tracking \
|
||||
--with-large-files \
|
||||
--with-default-user=squid \
|
||||
@@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
|
||||
|
||||
# --- --- --- --- --- --- --- --- ---
|
||||
|
||||
FROM alpine:3.17.2
|
||||
FROM alpine:3.18.4
|
||||
|
||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||
ENV TZ Europe/Moscow
|
||||
@@ -148,4 +148,4 @@ EXPOSE 3128/tcp
|
||||
|
||||
USER squid
|
||||
|
||||
CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
|
||||
CMD ["sh", "-c", "rm -f /var/run/squid/squid.pid ; /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
|
||||
|
Reference in New Issue
Block a user