mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-08-11 13:17:32 +00:00
Compare commits
2 Commits
b209dc2c5b
...
v6.0.2
Author | SHA1 | Date | |
---|---|---|---|
09aba63183
|
|||
358cbfef87
|
10
.github/workflows/dockerimage.yml
vendored
10
.github/workflows/dockerimage.yml
vendored
@@ -5,7 +5,7 @@ on:
|
||||
# Publish `master` as Docker `latest` image.
|
||||
branches:
|
||||
- master
|
||||
- v5
|
||||
- v6
|
||||
|
||||
# Publish `v1.2.3` tags as releases.
|
||||
tags:
|
||||
@@ -23,7 +23,7 @@ jobs:
|
||||
test:
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2
|
||||
@@ -39,7 +39,7 @@ jobs:
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.1
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -77,7 +77,7 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
@@ -128,7 +128,7 @@ jobs:
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.3.2
|
||||
uses: actions/cache@v3.3.1
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
|
12
Dockerfile
12
Dockerfile
@@ -1,6 +1,6 @@
|
||||
FROM alpine:3.18.3 as build
|
||||
FROM alpine:3.17.3 as build
|
||||
|
||||
ARG SQUID_VER=6.3
|
||||
ARG SQUID_VER=6.0.2
|
||||
|
||||
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,RADIUS" \
|
||||
--enable-auth-basic="getpwnam,NCSA,DB" \
|
||||
--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 \
|
||||
--enable-snmp \
|
||||
--disable-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.18.3
|
||||
FROM alpine:3.17.3
|
||||
|
||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||
ENV TZ Europe/Moscow
|
||||
@@ -148,4 +148,4 @@ EXPOSE 3128/tcp
|
||||
|
||||
USER squid
|
||||
|
||||
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"]
|
||||
CMD ["sh", "-c", "/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