1
0
mirror of https://github.com/b4tman/docker-squid.git synced 2025-05-16 05:44:26 +00:00

Compare commits

...

150 Commits

Author SHA1 Message Date
dependabot[bot]
89f53c9af2 Bump actions/cache from 4.2.2 to 4.2.3
Bumps [actions/cache](https://github.com/actions/cache) from 4.2.2 to 4.2.3.
- [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/v4.2.2...v4.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-01 10:58:35 +03:00
dependabot[bot]
883a36790a Bump alpine from 3.21.2 to 3.21.3
Bumps alpine from 3.21.2 to 3.21.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-01 13:36:42 +03:00
dependabot[bot]
3ff6520eeb Bump actions/cache from 4.2.0 to 4.2.2
Bumps [actions/cache](https://github.com/actions/cache) from 4.2.0 to 4.2.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/v4.2.0...v4.2.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>
2025-03-01 12:27:17 +03:00
3877c77b6f
update squid to 6.13 (#147)
* bump squid to 6.13

* fix download links
2025-02-22 17:56:04 +03:00
dependabot[bot]
eb2cea4f44 Bump alpine from 3.21.0 to 3.21.2
Bumps alpine from 3.21.0 to 3.21.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-01 16:44:49 +03:00
dependabot[bot]
39e61037cb Bump alpine from 3.20.3 to 3.21.0
Bumps alpine from 3.20.3 to 3.21.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-28 08:41:45 +03:00
dependabot[bot]
1e431e392b Bump actions/cache from 4.1.2 to 4.2.0
Bumps [actions/cache](https://github.com/actions/cache) from 4.1.2 to 4.2.0.
- [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/v4.1.2...v4.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-01-08 18:31:03 +03:00
dependabot[bot]
c75d1354aa Bump actions/cache from 4.0.2 to 4.1.2
Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to 4.1.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/v4.0.2...v4.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-11-01 10:58:48 +03:00
000a827460
Create FUNDING.yml [skip ci] 2024-10-07 10:05:12 +03:00
dependabot[bot]
8dab59fee5 Bump alpine from 3.20.2 to 3.20.3
Bumps alpine from 3.20.2 to 3.20.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-10-01 09:02:30 +03:00
dependabot[bot]
8669f6e1d5 Bump alpine from 3.20.1 to 3.20.2
Bumps alpine from 3.20.1 to 3.20.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-08-01 09:08:53 +03:00
dependabot[bot]
0978b18b73 Bump docker/build-push-action from 5 to 6
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 5 to 6.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 21:55:50 +03:00
dependabot[bot]
63cf1fc739 Bump alpine from 3.20.0 to 3.20.1
Bumps alpine from 3.20.0 to 3.20.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-01 12:11:24 +03:00
9aec6fae6a bump squid to 6.10 2024-06-19 12:30:56 +03:00
dependabot[bot]
75b290de69 Bump alpine from 3.19.1 to 3.20.0
Bumps alpine from 3.19.1 to 3.20.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-01 12:39:40 +03:00
8aab792bc1 bump squid to 6.9 2024-04-24 12:55:07 +03:00
dependabot[bot]
7ea8a5793f Bump actions/cache from 4.0.1 to 4.0.2
Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.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/v4.0.1...v4.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>
2024-04-01 08:54:55 +03:00
a3b674e1d5
CMD /run.sh 2024-03-26 12:32:52 +03:00
2bd55e0a98
fix timezone setup #133 2024-03-26 12:09:03 +03:00
fb56ae5164 bump squid to 6.8 2024-03-24 12:50:45 +03:00
dependabot[bot]
bb4a85b410 Bump actions/cache from 4.0.0 to 4.0.1
Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.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/v4.0.0...v4.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-01 09:05:29 +03:00
abfd29ad78
ssl-bump fix build 2024-02-19 14:40:17 +03:00
16e644983a
ssl-bump fix run.sh perms #130 2024-02-19 14:28:10 +03:00
33429ba79f ssl-bump fix run.sh perms 2024-02-19 14:16:43 +03:00
Dmitry Belyaev
05d3fc71a7
Merge pull request #129 from b4tman/update/6.7
bump squid to 6.7
2024-02-07 13:32:49 +03:00
19ecd62b08
upd gpg keys 2024-02-07 13:24:03 +03:00
4eb3c96208
bump squid to 6.7 2024-02-07 13:03:29 +03:00
dependabot[bot]
c1b8ceee1c Bump alpine from 3.19.0 to 3.19.1
Bumps alpine from 3.19.0 to 3.19.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-06 00:02:14 +03:00
dependabot[bot]
f504923719 Bump actions/cache from 3.3.2 to 4.0.0
Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 4.0.0.
- [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.3.2...v4.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-05 23:00:49 +03:00
12abc8228d sslbump: rootless (#125)
sslbump: shell script instead of long cmd

add 'ssl-bump' image test

add access_for_localnet for image test

allow_all instead of localnet for test

change test conf

fix test compose
2024-01-24 15:43:29 +03:00
dependabot[bot]
3ceca4d5f2 Bump alpine from 3.18.5 to 3.19.0
Bumps alpine from 3.18.5 to 3.19.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 22:43:09 +03:00
dependabot[bot]
0e54ff03de Bump actions/stale from 8 to 9
Bumps [actions/stale](https://github.com/actions/stale) from 8 to 9.
- [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/v8...v9)

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

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-01 22:40:29 +03:00
dd877b801a bump squid to 6.6 2023-12-07 16:20:31 +03:00
dependabot[bot]
6db980e029 Bump alpine from 3.18.4 to 3.18.5
Bumps alpine from 3.18.4 to 3.18.5.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-01 11:32:38 +03:00
2420794090 bump squid to 6.5 2023-11-20 10:39:50 +03:00
dependabot[bot]
7a1ebcb1ac Bump docker/build-push-action from 4 to 5
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 10:14:47 +03:00
dependabot[bot]
93898b83e2 Bump docker/metadata-action from 4 to 5
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4 to 5.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-01 08:35:55 +03:00
291ca028a1 bump squid to 6.4 2023-10-26 12:19:23 +03:00
dependabot[bot]
0f8b8450c4 Bump alpine from 3.18.3 to 3.18.4
Bumps alpine from 3.18.3 to 3.18.4.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 00:01:49 +03:00
dependabot[bot]
a9d2a11911 Bump docker/setup-buildx-action from 2 to 3
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-02 00:01:24 +03:00
dependabot[bot]
a9042a350a Bump docker/login-action from 2 to 3
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 22:21:31 +03:00
dependabot[bot]
558b4f3518 Bump docker/setup-qemu-action from 2 to 3
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 18:27:40 +03:00
dependabot[bot]
b209dc2c5b Bump actions/cache from 3.3.1 to 3.3.2
Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.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.3.1...v3.3.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>
2023-10-01 15:14:20 +03:00
dependabot[bot]
20ba07b326 Bump actions/checkout from 3 to 4
Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [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/v3...v4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-10-01 13:06:57 +03:00
b077ec9b09 bump squid to 6.3 2023-09-18 15:05:22 +03:00
f35cfdf194
Merge pull request #108 from b4tman/feature/enable-snmp
enable snmp
2023-09-12 13:20:57 +03:00
2a86036919
enable snmp 2023-09-11 23:07:37 +03:00
dependabot[bot]
2d0d3bd90c Bump alpine from 3.18.2 to 3.18.3
Bumps alpine from 3.18.2 to 3.18.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-01 08:49:04 +03:00
1d71370e48 bump squid to 6.2 2023-08-19 12:28:42 +03:00
e108ff41f6
force remove PID file on startup
to fix #104
2023-07-07 09:09:42 +03:00
e7d7016018
fix ci branches
[skip ci]
2023-07-06 16:17:53 +03:00
a89c6b2878 bump squid to 6.1 2023-07-06 16:05:22 +03:00
9f260deb7f bump squid to 6.0.3 2023-07-06 16:05:22 +03:00
94cc9e2244 push v6 images 2023-07-06 16:05:22 +03:00
83cd331a0b bump squid to 6.0.2 2023-07-06 16:05:22 +03:00
dependabot[bot]
1e0e16e157 Bump alpine from 3.18.0 to 3.18.2
Bumps alpine from 3.18.0 to 3.18.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-07-01 11:36:07 +03:00
6b980db7c7
Merge pull request #102 from b4tman/add/basic_radius_auth
add basic_radius_auth
2023-06-13 14:09:18 +03:00
2d8a60d962
add basic_radius_auth 2023-06-13 13:56:11 +03:00
dependabot[bot]
dabb437ea8 Bump alpine from 3.17.3 to 3.18.0
Bumps alpine from 3.17.3 to 3.18.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-06-01 09:01:19 +03:00
494e411d43 bump squid to 5.9 2023-05-02 10:47:29 +03:00
dependabot[bot]
d91a5600a9 Bump alpine from 3.17.2 to 3.17.3
Bumps alpine from 3.17.2 to 3.17.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 23:18:47 +03:00
dependabot[bot]
8781714110 Bump actions/cache from 3.2.6 to 3.3.1
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.6 to 3.3.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/v3.2.6...v3.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 18:43:45 +03:00
dependabot[bot]
083adc0c03 Bump actions/stale from 7 to 8
Bumps [actions/stale](https://github.com/actions/stale) from 7 to 8.
- [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/v7...v8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 13:06:21 +03:00
a1580af18a bump squid to 5.8 2023-03-01 18:34:17 +03:00
Dmitry Belyaev
244937d517
Merge pull request #93 from b4tman/refactor
refactor Dockerfile
2023-03-01 16:45:36 +03:00
4af565e3ae
build ssl-bump without docker/build-push-action 2023-03-01 16:30:13 +03:00
e4ff285091
build test image with output type=docker 2023-03-01 16:12:06 +03:00
00f78a3728
never pull test image 2023-03-01 15:53:52 +03:00
f8b9da006c
use builded image for test 2023-03-01 15:34:59 +03:00
0db0d2b19d
refactor Dockerfile 2023-03-01 14:30:21 +03:00
dependabot[bot]
23eacf4e57 Bump actions/cache from 3.2.4 to 3.2.6
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.4 to 3.2.6.
- [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.2.4...v3.2.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-01 10:06:58 +03:00
0eeb0d164a
Update README.md
remove useless badges

[skip ci]
2023-02-17 23:19:44 +03:00
dependabot[bot]
729ca2fafa Bump alpine from 3.16.2 to 3.17.2
Bumps alpine from 3.16.2 to 3.17.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-17 16:55:51 +03:00
62546a8254 openssl instead of libressl
(with static libs)
2023-02-17 14:32:11 +03:00
dependabot[bot]
ae76d1174d Bump actions/cache from 3.2.2 to 3.2.4
Bumps [actions/cache](https://github.com/actions/cache) from 3.2.2 to 3.2.4.
- [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.2.2...v3.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-01 17:08:55 +03:00
dependabot[bot]
9433d48c4f Bump docker/build-push-action from 3 to 4
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-01 13:06:10 +03:00
dependabot[bot]
9e91e64ef6 Bump actions/cache from 3.0.8 to 3.2.2
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.8 to 3.2.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.8...v3.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-04 01:28:23 +03:00
dependabot[bot]
1cc9b312f0 Bump actions/stale from 6 to 7
Bumps [actions/stale](https://github.com/actions/stale) from 6 to 7.
- [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/v6...v7)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-03 22:14:18 +03:00
dependabot[bot]
d54e44e377 Bump actions/stale from 5 to 6
Bumps [actions/stale](https://github.com/actions/stale) from 5 to 6.
- [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/v5...v6)

---
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-10-01 11:18:38 +03:00
9740438244 bump squid to 5.7 2022-09-06 11:33:39 +03:00
dependabot[bot]
b57acfb9a4 Bump alpine from 3.16.1 to 3.16.2
Bumps alpine from 3.16.1 to 3.16.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-01 18:12:25 +03:00
dependabot[bot]
bec4084981 Bump actions/cache from 3.0.5 to 3.0.8
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.5 to 3.0.8.
- [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.5...v3.0.8)

---
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-09-01 12:20:33 +03:00
dependabot[bot]
c2e70b044d Bump alpine from 3.16.0 to 3.16.1
Bumps alpine from 3.16.0 to 3.16.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-01 12:08:12 +03:00
dependabot[bot]
fcfa3b1c54 Bump actions/cache from 3.0.4 to 3.0.5
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5.
- [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.4...v3.0.5)

---
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-08-01 08:54:02 +03:00
dependabot[bot]
711d7a9857 Bump docker/metadata-action from 3 to 4
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 13:48:01 +03:00
dependabot[bot]
68366aee74 Bump actions/cache from 3.0.3 to 3.0.4
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.3 to 3.0.4.
- [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.3...v3.0.4)

---
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-07-01 10:41:18 +03:00
12bcc8b563 Revert "fix build dirs"
This reverts commit 1075790c45e132ce6289a774bfc6bc3b92d068d7.
2022-06-16 10:37:35 +03:00
551440b10b bump squid to 5.6 2022-06-16 10:37:35 +03:00
363e8fc3b3 bump libressl to 3.5 2022-06-02 12:41:41 +03:00
dependabot[bot]
70328d9317 Bump alpine from 3.15.4 to 3.16.0
Bumps alpine from 3.15.4 to 3.16.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-02 12:41:41 +03:00
dependabot[bot]
4f4a317dd1 Bump docker/build-push-action from 2 to 3
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-01 15:03:32 +03:00
dependabot[bot]
1a73d68725 Bump docker/setup-buildx-action from 1 to 2
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-01 15:03:19 +03:00
dependabot[bot]
3c252eeefc Bump docker/login-action from 1 to 2
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-01 15:02:47 +03:00
dependabot[bot]
adaca5c8f6 Bump docker/setup-qemu-action from 1 to 2
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-01 14:55:20 +03:00
dependabot[bot]
7c96578aba Bump actions/cache from 3.0.2 to 3.0.3
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.2 to 3.0.3.
- [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.2...v3.0.3)

---
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-06-01 14:06:05 +03:00
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
2d2de740db bump squid to 4.16 2021-08-10 10:49:48 +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
b68f62c04c
Merge pull request #45 from b4tman/dependabot/docker/alpine-3.14.0
Bump alpine from 3.13.5 to 3.14.0
2021-07-01 14:55:32 +03:00
2e3e78056d
fix sig verification
keys imported from http://www.squid-cache.org/pgp.asc

from https://sks-keyservers.net :
> This service is deprecated. This means it is no longer maintained, and new HKPS certificates will not be issued. Service reliability should not be expected.
>
> Update 2021-06-21: Due to even more GDPR takedown requests, the DNS records for the pool will no longer be provided at all.
2021-07-01 14:16:57 +03:00
9e6775a422
fix conflict with libretls and libressl 2021-07-01 13:12:33 +03:00
4649add0df
bump libressl to 3.3 2021-07-01 12:02:20 +03:00
dependabot[bot]
adc4f54b02
Bump alpine from 3.13.5 to 3.14.0
Bumps alpine from 3.13.5 to 3.14.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-07-01 02:00:23 +00:00
da817bec0d
Revert "disable (temp) multiarch"
This reverts commit 82d495d6815333f140efafd9f584958f095748f4.
2021-06-10 20:13:01 +03:00
20bcc3ca7d
remove dockerhub-description action 2021-06-10 20:12:18 +03:00
93fe767842
fix latest 2021-06-10 20:11:08 +03:00
82d495d681
disable (temp) multiarch 2021-06-10 19:20:54 +03:00
e023bae64b
latest tag and tag suffix 2021-06-10 19:19:35 +03:00
024ff445bb
fix ci 2021-06-10 19:07:18 +03:00
0dcc835803
Update ci (#44)
* + ghcr.io links

* update ci

* more cache moves

* fix cache move after compose test

* output image

* update description and don't login on PR's

* dependabot: actions
2021-06-10 17:17:50 +03:00
ba0d25813e
dockerhub login for build in drone cloud
https://discourse.drone.io/t/how-to-prevent-dockerhub-pull-rate-limit-errors/8324
2021-05-17 17:05:24 +03:00
f1c7c6796f bump squid to 4.15 2021-05-17 16:31:10 +03:00
dependabot[bot]
0e581bd499 Bump alpine from 3.13.4 to 3.13.5
Bumps alpine from 3.13.4 to 3.13.5.

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-01 11:17:41 +03:00
dependabot[bot]
bc32b5d1da Bump alpine from 3.13.2 to 3.13.4
Bumps alpine from 3.13.2 to 3.13.4.

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-01 09:04:41 +03:00
dependabot[bot]
7e71d6c43b Bump alpine from 3.13.1 to 3.13.2
Bumps alpine from 3.13.1 to 3.13.2.

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-01 08:59:31 +03:00
3d2e367c14 bump squid to 4.14 2021-02-16 21:02:46 +03:00
f5fbbb9034
fix docker cloud build status url 2021-02-11 21:46:14 +03:00
dependabot[bot]
a56bf2890d Bump alpine from 3.12.3 to 3.13.1
Bumps alpine from 3.12.3 to 3.13.1.

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-29 21:50:01 +03:00
dependabot[bot]
88f5a067fb Bump alpine from 3.12.1 to 3.12.3
Bumps alpine from 3.12.1 to 3.12.3.

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-01 13:03:24 +03:00
dependabot[bot]
b90f70705c Bump alpine from 3.12.0 to 3.12.1
Bumps alpine from 3.12.0 to 3.12.1.

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-01 12:25:08 +03:00
6eb782b5a6
Migrate to GitHub Container Registry
from GitHub Packages
https://docs.github.com/en/free-pro-team@latest/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images
2020-10-04 22:49:22 +03:00
c3138cec07
Merge pull request #33 from gianluca-mascolo/unittest
Feature: Use squidclient for unit test
2020-10-04 18:04:55 +03:00
gianluca-mascolo
d01a447dcf changed docker-compose version to support start_period 2020-10-04 16:18:04 +02:00
gianluca-mascolo
6486bd001c fix docker-compose version 2020-10-04 11:57:30 +02:00
gianluca-mascolo
212bdefa3b use squidclient for unit test 2020-10-03 17:49:14 +02:00
gianluca-mascolo
824146b6c6 compile install squidclient 2020-10-03 17:46:01 +03:00
ab6974f7b7
bump squid to 5.0.1 2020-02-02 19:26:12 +03:00
13 changed files with 2443 additions and 130 deletions

@ -17,16 +17,20 @@ steps:
username: b4tman
password:
from_secret: docker_password
config:
from_secret: docker_config
- name: squid-armhf image for github packages
image: plugins/docker
settings:
repo: docker.pkg.github.com/b4tman/docker-squid/squid-armhf
repo: ghcr.io/b4tman/squid-armhf
auto_tag: true
pull_image: true
registry: docker.pkg.github.com
registry: ghcr.io
username: b4tman
password:
from_secret: github_password
config:
from_secret: docker_config
trigger:
ref:
- refs/tags/**

1
.github/FUNDING.yml vendored Normal file

@ -0,0 +1 @@
custom: ['https://boosty.to/0xffff', 'https://www.donationalerts.com/r/b4tman1']

@ -1,8 +1,14 @@
version: 2
updates:
- package-ecosystem: docker
directory: "/"
schedule:
interval: monthly
time: '02:00'
open-pull-requests-limit: 10
- package-ecosystem: docker
directory: "/"
schedule:
interval: monthly
time: "02:00"
open-pull-requests-limit: 10
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: monthly
time: "03:00"

@ -4,80 +4,230 @@ on:
push:
# Publish `master` as Docker `latest` image.
branches:
- master
- master
- v5
# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
# Run tests for PRs to `master` branch.
pull_request:
branches:
- "master"
env:
TEST_TAG: b4tman/squid:test
jobs:
test:
runs-on: ubuntu-18.04
test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Build squid image
run: docker build . --file Dockerfile --tag b4tman/squid
- name: Test image
run: docker-compose -f docker-compose.test.yml up sut
- name: Build 'ssl-bump' image
run: docker build ssl-bump --tag b4tman/squid:ssl-bump
- uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
username: b4tman
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Cache Docker layers
uses: actions/cache@v4.2.3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Build squid image
uses: docker/build-push-action@v6
with:
context: .
push: false
load: true # automatically load the single-platform build result to docker images
tags: ${{ env.TEST_TAG }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Test image
run: |
set -ex
docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
docker compose -f docker-compose.test.yml down
- name: set base image for 'ssl-bump'
run: |
sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile
- name: Build 'ssl-bump' image
uses: docker/build-push-action@v6
with:
context: .
push: false
load: true
tags: ${{ env.TEST_TAG }}-ssl-bump
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Test 'ssl-bump' image
run: |
set -ex
TEST_TAG="${TEST_TAG}-ssl-bump" docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
docker compose -f docker-compose.test.yml down
push:
needs: test
runs-on: ubuntu-18.04
if: github.event_name == 'push'
runs-on: ubuntu-20.04
if: github.event_name != 'pull_request'
steps:
- uses: actions/checkout@v2
- name: Build squid image
run: docker build . --file Dockerfile --tag b4tman/squid
- name: Build 'ssl-bump' image
run: docker build ssl-bump --tag b4tman/squid:ssl-bump
- name: Log into registry
run: echo "${{ secrets.GITHUB_PKGS_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
- name: Push squid image
run: |
IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/squid
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag b4tman/squid $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
- name: Push 'ssl-bump' image
run: |
IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/ssl-bump
# Strip git ref prefix from version
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
# Strip "v" prefix from tag name
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
# Use Docker `latest` tag convention
[ "$VERSION" == "master" ] && VERSION=latest
echo IMAGE_ID=$IMAGE_ID
echo VERSION=$VERSION
docker tag b4tman/squid:ssl-bump $IMAGE_ID:$VERSION
docker push $IMAGE_ID:$VERSION
- uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
b4tman/squid
ghcr.io/b4tman/squid
flavor: |
latest=${{ github.ref == 'refs/heads/master' }}
tags: |
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Docker meta (ssl-bump)
id: meta_ssl_bump
uses: docker/metadata-action@v5
with:
images: |
b4tman/squid
ghcr.io/b4tman/squid
flavor: |
latest=false
suffix=-ssl-bump
tags: |
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Docker meta (ssl-bump ghcr)
id: meta_ssl_bump_ghcr
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/b4tman/squid-ssl-bump
flavor: |
latest=${{ github.ref == 'refs/heads/master' }}
tags: |
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Cache Docker layers
uses: actions/cache@v4.2.3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: b4tman
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
- name: Build squid image
uses: docker/build-push-action@v6
with:
context: .
push: true
platforms: linux/amd64,linux/arm/v7
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,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Build 'ssl-bump' image
uses: docker/build-push-action@v6
with:
context: ssl-bump
push: true
file: ssl-bump/Dockerfile
platforms: linux/amd64,linux/arm/v7
tags: ${{ steps.meta_ssl_bump.outputs.tags }}
labels: ${{ steps.meta_ssl_bump.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Build 'ssl-bump' image for ghcr
uses: docker/build-push-action@v6
with:
context: ssl-bump
push: true
file: ssl-bump/Dockerfile
platforms: linux/amd64,linux/arm/v7
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,mode=max
# Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

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@v9
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,7 +1,6 @@
FROM alpine:3.12.0 as build
FROM alpine:3.21.3 as build
ENV SQUID_VER 4.13
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
ARG SQUID_VER=6.13
RUN set -x && \
apk add --no-cache \
@ -10,7 +9,8 @@ RUN set -x && \
libc-dev \
curl \
gnupg \
libressl-dev \
openssl-dev \
openssl-libs-static \
perl-dev \
autoconf \
automake \
@ -21,34 +21,33 @@ RUN set -x && \
libcap-dev \
linux-headers
WORKDIR /tmp/build
RUN set -x && \
mkdir -p /tmp/build && \
cd /tmp/build && \
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc
curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.gz" -o squid-${SQUID_VER}.tar.gz && \
curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.gz.asc" -o squid-${SQUID_VER}.tar.gz.asc
COPY squid-keys.asc /tmp/build
RUN set -x && \
cd /tmp/build && \
export GNUPGHOME="$(mktemp -d)" && \
( \
gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${SQUID_SIG_KEY} || \
gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY} || \
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys ${SQUID_SIG_KEY} \
) && \
GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME && \
gpg --import squid-keys.asc && \
gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
rm -rf "$GNUPGHOME"
RUN set -x && \
cd /tmp/build && \
tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
\
MACHINE=$(uname -m) && \
\
CFLAGS="-g0 -O2" \
CXXFLAGS="-g0 -O2" \
LDFLAGS="-s" \
\
./configure \
--build="$(uname -m)" \
--host="$(uname -m)" \
--build="$MACHINE" \
--host="$MACHINE" \
--prefix=/usr \
--datadir=/usr/share/squid \
--sysconfdir=/etc/squid \
@ -59,7 +58,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,RADIUS" \
--enable-basic-auth-helpers="DB" \
--enable-epoll \
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
--enable-auth-ntlm="fake" \
@ -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 \
@ -94,15 +94,19 @@ RUN set -x && \
--with-pidfile=/var/run/squid/squid.pid
RUN set -x && \
cd /tmp/build && \
nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
nproc=$(n=$(nproc) ; max_n=6 ; echo $(( n <= max_n ? n : max_n )) ) && \
make -j $nproc && \
make install
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.12.0
WORKDIR /tmp/build/tools/squidclient
RUN make && make install-strip
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
# --- --- --- --- --- --- --- --- ---
FROM alpine:3.21.3
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
ENV TZ Europe/Moscow
@ -115,35 +119,31 @@ RUN apk add --no-cache \
libstdc++ \
heimdal-libs \
libcap \
libressl3.1-libcrypto \
libressl3.1-libssl \
libltdl
libltdl \
tzdata
COPY --from=build /etc/squid/ /etc/squid/
COPY --from=build /usr/lib/squid/ /usr/lib/squid/
COPY --from=build /usr/share/squid/ /usr/share/squid/
COPY --from=build /usr/sbin/squid /usr/sbin/squid
COPY --from=build /usr/bin/squidclient /usr/bin/squidclient
COPY --chmod=755 run.sh /
RUN install -d -o squid -g squid \
/var/cache/squid \
/var/log/squid \
/var/run/squid && \
chmod +x /usr/lib/squid/*
RUN install -d -m 755 -o squid -g squid \
chmod +x /usr/lib/squid/* && \
install -d -m 755 -o squid -g squid \
/etc/squid/conf.d \
/etc/squid/conf.d.tail
RUN touch /etc/squid/conf.d/placeholder.conf
/etc/squid/conf.d.tail && \
touch /etc/squid/conf.d/placeholder.conf
COPY squid-log.conf /etc/squid/conf.d.tail/
RUN set -x && \
apk add --no-cache --virtual .tz alpine-conf tzdata && \
/sbin/setup-timezone -z $TZ && \
apk del .tz
VOLUME ["/var/cache/squid"]
VOLUME ["/var/cache/squid"]
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 ["/run.sh"]

@ -1,12 +1,17 @@
[![Drone Build Status](https://cloud.drone.io/api/badges/b4tman/docker-squid/status.svg?ref=refs/heads/master)](https://cloud.drone.io/b4tman/docker-squid)
![Docker Build Status](https://img.shields.io/docker/build/b4tman/squid)
![Docker Image CI Status](https://github.com/b4tman/docker-squid/workflows/Docker%20Image%20CI/badge.svg)
# docker-squid
Docker Squid container based on Alpine Linux.
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/b4tman/squid).
Automated builds of the image are available on:
- DockerHub:
- [b4tman/squid](https://hub.docker.com/r/b4tman/squid)
- Github:
- [ghcr.io/b4tman/squid](https://github.com/users/b4tman/packages/container/package/squid)
- [ghcr.io/b4tman/squid-armhf](https://github.com/users/b4tman/packages/container/package/squid-armhf)
- [ghcr.io/b4tman/squid-ssl-bump](https://github.com/users/b4tman/packages/container/package/squid-ssl-bump)
# Quick Start
@ -29,7 +34,6 @@ docker-compose up
- **SQUID_CONFIG_FILE**: Specify the configuration file for squid. Defaults to `/etc/squid/squid.conf`.
## Example:
```bash
@ -39,4 +43,4 @@ docker run -p 3128:3128 \
b4tman/squid
```
This will start a squid container with your config file `/srv/docker/squid/squid.conf`.
This will start a squid container with your config file `/srv/docker/squid/squid.conf`.

@ -1,11 +1,20 @@
version: '2'
version: '2.3'
services:
proxy:
build: .
image: "${TEST_TAG}"
volumes:
- './test_localnet.conf:/etc/squid/conf.d/test_localnet.conf:ro'
healthcheck:
test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"]
interval: 5s
timeout: 3s
retries: 5
start_period: 1s
sut:
image: alpine:3.10.1
image: "${TEST_TAG}"
links:
- proxy
depends_on:
- proxy
command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"
command: sh -exc "sleep 10 && squidclient -h proxy -T 3 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200 OK'"

14
run.sh Normal file

@ -0,0 +1,14 @@
#!/bin/sh
set -x
# force remove pid
if [ -e /var/run/squid/squid.pid ]; then
rm -f /var/run/squid/squid.pid
fi
# init cache
/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
# run squid
exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1

2067
squid-keys.asc Normal file

File diff suppressed because it is too large Load Diff

@ -1,4 +1,9 @@
FROM b4tman/squid
COPY run.sh /
USER root
CMD ["sh", "-c", "(test -d /var/cache/squid/ssl_db || /usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB) && /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
RUN chmod 755 /run.sh
USER squid
CMD ["/run.sh"]

14
ssl-bump/run.sh Normal file

@ -0,0 +1,14 @@
#!/bin/sh
set -x
# init ssl_db
if [ ! -d /var/cache/squid/ssl_db ]; then
/usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB
fi
# init cache
/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
# run squid
exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1

11
test_localnet.conf Normal file

@ -0,0 +1,11 @@
acl localnet1 src 0.0.0.1-0.255.255.255 # RFC 1122 "this" network (LAN)
acl localnet1 src 10.0.0.0/8 # RFC 1918 local private network (LAN)
acl localnet1 src 100.64.0.0/10 # RFC 6598 shared address space (CGN)
acl localnet1 src 169.254.0.0/16 # RFC 3927 link-local (directly plugged) machines
acl localnet1 src 172.16.0.0/12 # RFC 1918 local private network (LAN)
acl localnet1 src 192.168.0.0/16 # RFC 1918 local private network (LAN)
acl localnet1 src fc00::/7 # RFC 4193 local private network range
acl localnet1 src fe80::/10 # RFC 4291 link-local (directly plugged) machines
http_access allow localnet1
http_access allow localhost manager