mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-09-20 15:49:07 +00:00
Compare commits
2 Commits
89f53c9af2
...
bc1e2c287d
Author | SHA1 | Date | |
---|---|---|---|
|
bc1e2c287d | ||
8723ca0ca8
|
4
.github/workflows/dockerimage.yml
vendored
4
.github/workflows/dockerimage.yml
vendored
@@ -21,7 +21,7 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
@@ -99,7 +99,7 @@ jobs:
|
|||||||
docker compose -f docker-compose.test.yml down
|
docker compose -f docker-compose.test.yml down
|
||||||
push:
|
push:
|
||||||
needs: test
|
needs: test
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
FROM alpine:3.21.3 as build
|
FROM alpine:3.22.0 as build
|
||||||
|
|
||||||
ARG SQUID_VER=6.13
|
ARG SQUID_VER=6.13
|
||||||
|
|
||||||
@@ -106,7 +106,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
|
|||||||
|
|
||||||
# --- --- --- --- --- --- --- --- ---
|
# --- --- --- --- --- --- --- --- ---
|
||||||
|
|
||||||
FROM alpine:3.21.3
|
FROM alpine:3.22.0
|
||||||
|
|
||||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||||
ENV TZ Europe/Moscow
|
ENV TZ Europe/Moscow
|
||||||
|
Reference in New Issue
Block a user