mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-09-20 07:39:09 +00:00
Compare commits
2 Commits
89f53c9af2
...
bc1e2c287d
Author | SHA1 | Date | |
---|---|---|---|
|
bc1e2c287d | ||
8723ca0ca8
|
6
.github/workflows/dockerimage.yml
vendored
6
.github/workflows/dockerimage.yml
vendored
@@ -4,7 +4,7 @@ on:
|
||||
push:
|
||||
# Publish `master` as Docker `latest` image.
|
||||
branches:
|
||||
- master
|
||||
- master
|
||||
- v5
|
||||
|
||||
# Publish `v1.2.3` tags as releases.
|
||||
@@ -21,7 +21,7 @@ env:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
@@ -99,7 +99,7 @@ jobs:
|
||||
docker compose -f docker-compose.test.yml down
|
||||
push:
|
||||
needs: test
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- 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
|
||||
|
||||
@@ -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 TZ Europe/Moscow
|
||||
|
Reference in New Issue
Block a user