mirror of
https://github.com/b4tman/docker-squid.git
synced 2026-07-16 05:22:54 +03:00
Compare commits
13 Commits
v7.5.0
..
7507dc1bd5
| Author | SHA1 | Date | |
|---|---|---|---|
| 7507dc1bd5 | |||
| 9953814fdd | |||
| 4bd4e1b780 | |||
| 2e259018be | |||
| 25571919e3 | |||
| 365509ac6f | |||
| 66bb07f90f | |||
| bf5d4b5204 | |||
| 38b02d14fd | |||
| 04e457ba53 | |||
| b1ca8a345b | |||
| 2163ad1e6b | |||
| 9c7cd164d8 |
@@ -23,23 +23,23 @@ jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v7
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
uses: docker/setup-qemu-action@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Login to DockerHub
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v3
|
||||
uses: docker/login-action@v4
|
||||
with:
|
||||
username: b4tman
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v5.0.3
|
||||
uses: actions/cache@v6.1.0
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -47,7 +47,7 @@ jobs:
|
||||
${{ runner.os }}-buildx-
|
||||
|
||||
- name: Build squid image
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
@@ -75,7 +75,7 @@ jobs:
|
||||
sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile
|
||||
|
||||
- name: Build 'ssl-bump' image
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
@@ -102,11 +102,11 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
- uses: actions/checkout@v7
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
uses: docker/metadata-action@v6
|
||||
with:
|
||||
images: |
|
||||
b4tman/squid
|
||||
@@ -120,7 +120,7 @@ jobs:
|
||||
|
||||
- name: Docker meta (ssl-bump)
|
||||
id: meta_ssl_bump
|
||||
uses: docker/metadata-action@v5
|
||||
uses: docker/metadata-action@v6
|
||||
with:
|
||||
images: |
|
||||
b4tman/squid
|
||||
@@ -135,7 +135,7 @@ jobs:
|
||||
|
||||
- name: Docker meta (ssl-bump ghcr)
|
||||
id: meta_ssl_bump_ghcr
|
||||
uses: docker/metadata-action@v5
|
||||
uses: docker/metadata-action@v6
|
||||
with:
|
||||
images: |
|
||||
ghcr.io/b4tman/squid-ssl-bump
|
||||
@@ -147,13 +147,13 @@ jobs:
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v3
|
||||
uses: docker/setup-qemu-action@v4
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
uses: docker/setup-buildx-action@v4
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v5.0.3
|
||||
uses: actions/cache@v6.1.0
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -161,20 +161,20 @@ jobs:
|
||||
${{ runner.os }}-buildx-
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v3
|
||||
uses: docker/login-action@v4
|
||||
with:
|
||||
username: b4tman
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Login to GHCR
|
||||
uses: docker/login-action@v3
|
||||
uses: docker/login-action@v4
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ github.repository_owner }}
|
||||
password: ${{ secrets.CR_PAT }}
|
||||
|
||||
- name: Build squid image
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
@@ -193,7 +193,7 @@ jobs:
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
|
||||
- name: Build 'ssl-bump' image
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: ssl-bump
|
||||
push: true
|
||||
@@ -213,7 +213,7 @@ jobs:
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
|
||||
- name: Build 'ssl-bump' image for ghcr
|
||||
uses: docker/build-push-action@v6
|
||||
uses: docker/build-push-action@v7
|
||||
with:
|
||||
context: ssl-bump
|
||||
push: true
|
||||
|
||||
+7
-7
@@ -1,6 +1,6 @@
|
||||
FROM alpine:3.23.3 AS build
|
||||
FROM alpine:3.24.1 AS build
|
||||
|
||||
ARG SQUID_VER=7.5
|
||||
ARG SQUID_VER=7.6
|
||||
|
||||
RUN set -x && \
|
||||
apk add --no-cache \
|
||||
@@ -24,8 +24,8 @@ RUN set -x && \
|
||||
WORKDIR /tmp/build
|
||||
|
||||
RUN set -x && \
|
||||
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
|
||||
curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.xz" -o squid-${SQUID_VER}.tar.xz && \
|
||||
curl -fSsL "https://github.com/squid-cache/squid/releases/download/SQUID_${SQUID_VER//./_}/squid-${SQUID_VER}.tar.xz.asc" -o squid-${SQUID_VER}.tar.xz.asc
|
||||
|
||||
COPY squid-keys.asc /tmp/build
|
||||
|
||||
@@ -33,11 +33,11 @@ RUN set -x && \
|
||||
GNUPGHOME="$(mktemp -d)" && \
|
||||
export GNUPGHOME && \
|
||||
gpg --import squid-keys.asc && \
|
||||
gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
|
||||
gpg --batch --verify squid-${SQUID_VER}.tar.xz.asc squid-${SQUID_VER}.tar.xz && \
|
||||
rm -rf "$GNUPGHOME"
|
||||
|
||||
RUN set -x && \
|
||||
tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
|
||||
tar --strip 1 -xf squid-${SQUID_VER}.tar.xz && \
|
||||
\
|
||||
MACHINE=$(uname -m) && \
|
||||
\
|
||||
@@ -103,7 +103,7 @@ RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
|
||||
|
||||
# --- --- --- --- --- --- --- --- ---
|
||||
|
||||
FROM alpine:3.23.3
|
||||
FROM alpine:3.24.1
|
||||
|
||||
ENV SQUID_CONFIG_FILE=/etc/squid/squid.conf
|
||||
ENV TZ=Europe/Moscow
|
||||
|
||||
Reference in New Issue
Block a user