mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-08-23 19:07:32 +00:00
Compare commits
11 Commits
Author | SHA1 | Date | |
---|---|---|---|
b1a8f65fe3 | |||
02094e50e2 | |||
411b922800 | |||
|
92cf56c414 | ||
029f8e55aa | |||
3895aba33e | |||
685eeddf3e
|
|||
1075790c45
|
|||
9d7abf3dea
|
|||
3ce1d078b7
|
|||
ab6974f7b7
|
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@v3
|
||||||
|
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.'
|
20
Dockerfile
20
Dockerfile
@@ -1,11 +1,6 @@
|
|||||||
FROM alpine:3.14.0 as build
|
FROM alpine:3.14.2 as build
|
||||||
|
|
||||||
ENV SQUID_VER 4.16
|
ENV SQUID_VER 5.2
|
||||||
|
|
||||||
# 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 \
|
||||||
@@ -95,6 +90,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 +105,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.14.2
|
||||||
|
|
||||||
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,11 +114,6 @@ 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 \
|
||||||
|
Reference in New Issue
Block a user