1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2025-09-02 23:47:30 +00:00

26 Commits

Author SHA1 Message Date
dependabot[bot]
18a19cf903 Bump alpine from 3.15.3 to 3.15.4
Bumps alpine from 3.15.3 to 3.15.4.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-02 20:55:52 +03:00
dependabot[bot]
e80cef4c10 Bump actions/cache from 3.0.1 to 3.0.2
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-02 18:37:32 +03:00
dependabot[bot]
028f616481 Bump actions/stale from 4 to 5
Bumps [actions/stale](https://github.com/actions/stale) from 4 to 5.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-02 15:19:54 +03:00
cdc5ff74b5 bump squid to 5.5 2022-04-20 10:39:47 +03:00
d745475ec5 fix mixed line endings 2022-04-20 10:39:47 +03:00
dependabot[bot]
330ade1664 Bump actions/cache from 2 to 3.0.1
Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-06 09:18:42 +03:00
dependabot[bot]
19a48fb8cb Bump actions/checkout from 2 to 3
Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-05 16:58:49 +03:00
dependabot[bot]
ae6037f2d7 Bump alpine from 3.15.0 to 3.15.3
Bumps alpine from 3.15.0 to 3.15.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-05 10:57:35 +03:00
2f0d4d2f76 github actions: cache mode=max 2022-02-11 14:48:38 +03:00
0fd6d1f258 bump squid to 5.4 2022-02-10 14:23:09 +03:00
178974b0df bump squid to 5.3 2022-01-15 19:18:41 +03:00
2eea5bc28f enable squid_db_auth #54 2021-12-22 16:21:59 +03:00
2ba626f10a bump libressl to 3.4 2021-12-01 11:39:54 +03:00
dependabot[bot]
f9e3532674 Bump alpine from 3.14.2 to 3.15.0
Bumps alpine from 3.14.2 to 3.15.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-12-01 11:39:54 +03:00
dependabot[bot]
79c4b13210 Bump actions/stale from 3 to 4
Bumps [actions/stale](https://github.com/actions/stale) from 3 to 4.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 08:56:41 +03:00
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
4 changed files with 52 additions and 29 deletions

View File

@@ -1,17 +1,17 @@
---
kind: pipeline
type: docker
name: arm64 images
name: arm32 images
platform:
os: linux
arch: arm64
arch: arm
steps:
- name: squid image for dockerhub
image: plugins/docker
settings:
repo: docker.io/b4tman/squid
auto_tag: true
auto_tag_suffix: arm64
auto_tag_suffix: armhf
pull_image: true
registry: docker.io
username: b4tman
@@ -19,10 +19,10 @@ steps:
from_secret: docker_password
config:
from_secret: docker_config
- name: squid-arm64 image for github packages
- name: squid-armhf image for github packages
image: plugins/docker
settings:
repo: ghcr.io/b4tman/squid-arm64
repo: ghcr.io/b4tman/squid-armhf
auto_tag: true
pull_image: true
registry: ghcr.io

View File

@@ -19,7 +19,7 @@ jobs:
test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@@ -35,7 +35,7 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3.0.2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -49,7 +49,7 @@ jobs:
push: false
tags: b4tman/squid
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
outputs: type=image,name=b4tman/squid,push=false
# Temp fix
@@ -71,7 +71,7 @@ jobs:
file: ssl-bump/Dockerfile
tags: b4tman/squid:ssl-bump
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
@@ -86,7 +86,7 @@ jobs:
runs-on: ubuntu-20.04
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Docker meta
id: meta
@@ -137,7 +137,7 @@ jobs:
uses: docker/setup-buildx-action@v1
- name: Cache Docker layers
uses: actions/cache@v2
uses: actions/cache@v3.0.2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -166,7 +166,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
@@ -206,7 +206,7 @@ jobs:
tags: ${{ steps.meta_ssl_bump_ghcr.outputs.tags }}
labels: ${{ steps.meta_ssl_bump_ghcr.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252

28
.github/workflows/stale.yml vendored Normal file
View 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@v5
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.'

View File

@@ -1,11 +1,6 @@
FROM alpine:3.14.0 as build
FROM alpine:3.15.4 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.5
RUN set -x && \
apk add --no-cache \
@@ -61,7 +56,8 @@ RUN set -x && \
--disable-arch-native \
--enable-removal-policies="lru,heap" \
--enable-auth-digest \
--enable-auth-basic="getpwnam,NCSA" \
--enable-auth-basic="getpwnam,NCSA,DB" \
--enable-basic-auth-helpers="DB" \
--enable-epoll \
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
--enable-auth-ntlm="fake" \
@@ -95,6 +91,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 +106,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.15.4
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow
@@ -115,17 +115,12 @@ 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 \
libcap \
libressl3.3-libcrypto \
libressl3.3-libssl \
libressl3.4-libcrypto \
libressl3.4-libssl \
libltdl
COPY --from=build /etc/squid/ /etc/squid/