mirror of
https://github.com/b4tman/docker-squid.git
synced 2026-09-20 21:21:13 +03:00
Compare commits
6
Commits
2e259018be
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7901f03cc1 | ||
|
|
0aa934559f | ||
|
|
90fff72a47 | ||
|
|
7507dc1bd5 | ||
|
|
9953814fdd | ||
|
|
4bd4e1b780 |
@@ -23,7 +23,7 @@ jobs:
|
|||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v7
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v4
|
uses: docker/setup-qemu-action@v4
|
||||||
@@ -39,7 +39,7 @@ jobs:
|
|||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
- name: Cache Docker layers
|
- name: Cache Docker layers
|
||||||
uses: actions/cache@v5.0.5
|
uses: actions/cache@v6.1.0
|
||||||
with:
|
with:
|
||||||
path: /tmp/.buildx-cache
|
path: /tmp/.buildx-cache
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||||
@@ -102,7 +102,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v7
|
||||||
|
|
||||||
- name: Docker meta
|
- name: Docker meta
|
||||||
id: meta
|
id: meta
|
||||||
@@ -153,7 +153,7 @@ jobs:
|
|||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v4
|
||||||
|
|
||||||
- name: Cache Docker layers
|
- name: Cache Docker layers
|
||||||
uses: actions/cache@v5.0.5
|
uses: actions/cache@v6.1.0
|
||||||
with:
|
with:
|
||||||
path: /tmp/.buildx-cache
|
path: /tmp/.buildx-cache
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ jobs:
|
|||||||
pull-requests: write
|
pull-requests: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v10
|
- uses: actions/stale@v11
|
||||||
with:
|
with:
|
||||||
days-before-stale: 182
|
days-before-stale: 182
|
||||||
days-before-close: 7
|
days-before-close: 7
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
FROM alpine:3.23.4 AS build
|
FROM alpine:3.24.1 AS build
|
||||||
|
|
||||||
ARG SQUID_VER=7.6
|
ARG SQUID_VER=7.7
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
@@ -103,7 +103,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
|
|||||||
|
|
||||||
# --- --- --- --- --- --- --- --- ---
|
# --- --- --- --- --- --- --- --- ---
|
||||||
|
|
||||||
FROM alpine:3.23.4
|
FROM alpine:3.24.1
|
||||||
|
|
||||||
ENV SQUID_CONFIG_FILE=/etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE=/etc/squid/squid.conf
|
||||||
ENV TZ=Europe/Moscow
|
ENV TZ=Europe/Moscow
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
# docker-squid
|
# docker-squid
|
||||||
@@ -25,7 +27,7 @@ or use [docker-compose](https://docs.docker.com/compose/):
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
wget https://raw.githubusercontent.com/b4tman/docker-squid/master/docker-compose.yml
|
wget https://raw.githubusercontent.com/b4tman/docker-squid/master/docker-compose.yml
|
||||||
docker-compose up
|
docker compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
|
|||||||
Reference in New Issue
Block a user