force remove PID file on startup

to fix #104
fix ci branches
2025-12-14 13:29:16 +00:00 · 2023-07-07 09:09:42 +03:00 · 2023-07-06 16:17:53 +03:00 · 2023-07-06 16:05:22 +03:00 · 2023-07-06 16:05:22 +03:00 · 2023-07-06 16:05:22 +03:00
3 changed files with 10 additions and 9 deletions
--- a/.github/workflows/dockerimage.yml
+++ b/.github/workflows/dockerimage.yml
@@ -4,7 +4,8 @@ on:
  push:
    # Publish `master` as Docker `latest` image.
    branches:
-      - master
+      - master
+      - v5

    # Publish `v1.2.3` tags as releases.
    tags:
@@ -38,7 +39,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Cache Docker layers
-        uses: actions/cache@v3.2.6
+        uses: actions/cache@v3.3.1
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -127,7 +128,7 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: Cache Docker layers
-        uses: actions/cache@v3.2.6
+        uses: actions/cache@v3.3.1
        with:
          path: /tmp/.buildx-cache
          key: ${{ runner.os }}-buildx-${{ github.sha }}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -18,7 +18,7 @@ jobs:
      pull-requests: write

    steps:
-    - uses: actions/stale@v7
+    - uses: actions/stale@v8
      with:
        days-before-stale: 182
        days-before-close: 7
--- a/10
+++ b/10
@@ -1,6 +1,6 @@
-FROM alpine:3.17.2 as build
+FROM alpine:3.18.2 as build

-ARG SQUID_VER=5.7
+ARG SQUID_VER=6.1

 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" \
+		--enable-auth-basic="getpwnam,NCSA,DB,RADIUS" \
 		--enable-basic-auth-helpers="DB" \
 		--enable-epoll \
 		--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
@@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \

 # --- --- --- --- --- --- --- --- ---

-FROM alpine:3.17.2
+FROM alpine:3.18.2
 	
 ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
 ENV TZ Europe/Moscow
@@ -148,4 +148,4 @@ 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 ["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"]
Author	SHA1	Message	Date
Dmitry	e108ff41f6	force remove PID file on startup to fix #104	2023-07-07 09:09:42 +03:00
Dmitry	e7d7016018	fix ci branches [skip ci]	2023-07-06 16:17:53 +03:00
Dmitry	a89c6b2878	bump squid to 6.1	2023-07-06 16:05:22 +03:00
Dmitry	9f260deb7f	bump squid to 6.0.3	2023-07-06 16:05:22 +03:00
Dmitry	94cc9e2244	push v6 images	2023-07-06 16:05:22 +03:00
Dmitry	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
Dmitry Belyaev	6b980db7c7	Merge pull request #102 from b4tman/add/basic_radius_auth add basic_radius_auth	2023-06-13 14:09:18 +03:00
Dmitry Belyaev	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
Dmitry	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
Dmitry	a1580af18a	bump squid to 5.8	2023-03-01 18:34:17 +03:00