mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-12-15 05:42:37 +00:00
Compare commits
15 Commits
v5.6.0
...
0eeb0d164a
| Author | SHA1 | Date | |
|---|---|---|---|
| 0eeb0d164a | |||
|
|
729ca2fafa | ||
| 62546a8254 | |||
|
|
ae76d1174d | ||
|
|
9433d48c4f | ||
|
|
9e91e64ef6 | ||
|
|
1cc9b312f0 | ||
|
|
d54e44e377 | ||
| 9740438244 | |||
|
|
b57acfb9a4 | ||
|
|
bec4084981 | ||
|
|
c2e70b044d | ||
|
|
fcfa3b1c54 | ||
|
|
711d7a9857 | ||
|
|
68366aee74 |
20
.github/workflows/dockerimage.yml
vendored
20
.github/workflows/dockerimage.yml
vendored
@@ -35,7 +35,7 @@ jobs:
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.0.3
|
||||
uses: actions/cache@v3.2.4
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -43,7 +43,7 @@ jobs:
|
||||
${{ runner.os }}-buildx-
|
||||
|
||||
- name: Build squid image
|
||||
uses: docker/build-push-action@v3
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: .
|
||||
push: false
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
run: docker-compose -f docker-compose.test.yml up sut
|
||||
|
||||
- name: Build 'ssl-bump' image
|
||||
uses: docker/build-push-action@v3
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: ssl-bump
|
||||
push: false
|
||||
@@ -90,7 +90,7 @@ jobs:
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
b4tman/squid
|
||||
@@ -104,7 +104,7 @@ jobs:
|
||||
|
||||
- name: Docker meta (ssl-bump)
|
||||
id: meta_ssl_bump
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
b4tman/squid
|
||||
@@ -119,7 +119,7 @@ jobs:
|
||||
|
||||
- name: Docker meta (ssl-bump ghcr)
|
||||
id: meta_ssl_bump_ghcr
|
||||
uses: docker/metadata-action@v3
|
||||
uses: docker/metadata-action@v4
|
||||
with:
|
||||
images: |
|
||||
ghcr.io/b4tman/squid-ssl-bump
|
||||
@@ -137,7 +137,7 @@ jobs:
|
||||
uses: docker/setup-buildx-action@v2
|
||||
|
||||
- name: Cache Docker layers
|
||||
uses: actions/cache@v3.0.3
|
||||
uses: actions/cache@v3.2.4
|
||||
with:
|
||||
path: /tmp/.buildx-cache
|
||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
||||
@@ -158,7 +158,7 @@ jobs:
|
||||
password: ${{ secrets.CR_PAT }}
|
||||
|
||||
- name: Build squid image
|
||||
uses: docker/build-push-action@v3
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: .
|
||||
push: true
|
||||
@@ -177,7 +177,7 @@ jobs:
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
|
||||
- name: Build 'ssl-bump' image
|
||||
uses: docker/build-push-action@v3
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: ssl-bump
|
||||
push: true
|
||||
@@ -197,7 +197,7 @@ jobs:
|
||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
||||
|
||||
- name: Build 'ssl-bump' image for ghcr
|
||||
uses: docker/build-push-action@v3
|
||||
uses: docker/build-push-action@v4
|
||||
with:
|
||||
context: ssl-bump
|
||||
push: true
|
||||
|
||||
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -18,7 +18,7 @@ jobs:
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v5
|
||||
- uses: actions/stale@v7
|
||||
with:
|
||||
days-before-stale: 182
|
||||
days-before-close: 7
|
||||
|
||||
11
Dockerfile
11
Dockerfile
@@ -1,6 +1,6 @@
|
||||
FROM alpine:3.16.0 as build
|
||||
FROM alpine:3.17.2 as build
|
||||
|
||||
ENV SQUID_VER 5.6
|
||||
ENV SQUID_VER 5.7
|
||||
|
||||
RUN set -x && \
|
||||
apk add --no-cache \
|
||||
@@ -9,7 +9,8 @@ RUN set -x && \
|
||||
libc-dev \
|
||||
curl \
|
||||
gnupg \
|
||||
libressl-dev \
|
||||
openssl-dev \
|
||||
openssl-libs-static \
|
||||
perl-dev \
|
||||
autoconf \
|
||||
automake \
|
||||
@@ -102,7 +103,7 @@ RUN set -x && \
|
||||
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf
|
||||
RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
|
||||
|
||||
FROM alpine:3.16.0
|
||||
FROM alpine:3.17.2
|
||||
|
||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||
ENV TZ Europe/Moscow
|
||||
@@ -115,8 +116,6 @@ RUN apk add --no-cache \
|
||||
libstdc++ \
|
||||
heimdal-libs \
|
||||
libcap \
|
||||
libressl3.5-libcrypto \
|
||||
libressl3.5-libssl \
|
||||
libltdl
|
||||
|
||||
COPY --from=build /etc/squid/ /etc/squid/
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
[](https://cloud.drone.io/b4tman/docker-squid)
|
||||

|
||||

|
||||
|
||||
# docker-squid
|
||||
|
||||
Reference in New Issue
Block a user