1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2025-07-22 20:33:29 +00:00

11 Commits
v4 ... v5.2.0

Author SHA1 Message Date
b1a8f65fe3 bump squid to 5.2 2021-10-04 10:54:23 +03:00
02094e50e2 Create stale.yml 2021-10-04 10:08:52 +03:00
411b922800 remove alpine 3.14.0 libretls fix 2021-09-01 10:14:07 +03:00
dependabot[bot]
92cf56c414 Bump alpine from 3.14.0 to 3.14.2
Bumps alpine from 3.14.0 to 3.14.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 10:14:07 +03:00
029f8e55aa Merge pull request #21 from b4tman/v5
v5.1
2021-08-10 12:44:07 +03:00
3895aba33e Merge branch 'master' into v5 2021-08-10 12:19:06 +03:00
685eeddf3e bump squid to 5.1 2021-08-10 11:33:29 +03:00
1075790c45 fix build dirs 2021-08-10 11:28:21 +03:00
9d7abf3dea bump to 5.0.7 2021-08-10 10:41:20 +03:00
3ce1d078b7 Merge branch 'master' into v5
# Conflicts:
#	Dockerfile
2021-08-10 10:38:56 +03:00
ab6974f7b7 bump squid to 5.0.1 2020-02-02 19:26:12 +03:00
2 changed files with 35 additions and 13 deletions
.github/workflows
Dockerfile

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.'

@@ -1,11 +1,6 @@
FROM alpine:3.14.0 as build
FROM alpine:3.14.2 as build
ENV SQUID_VER 4.16
# fix conflict with libretls and libressl
RUN set -x && \
apk add --no-cache libretls && \
apk upgrade --no-cache libretls
ENV SQUID_VER 5.2
RUN set -x && \
apk add --no-cache \
@@ -95,6 +90,10 @@ 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 +105,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.14.0
FROM alpine:3.14.2
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow
@@ -115,11 +114,6 @@ 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 \