mirror of
https://github.com/b4tman/docker-squid.git
synced 2025-09-20 15:49:07 +00:00
Compare commits
8 Commits
a3b674e1d5
...
v5_sub
Author | SHA1 | Date | |
---|---|---|---|
9767c69658
|
|||
1457a648ef
|
|||
0811260ffc
|
|||
4bdeed1c25
|
|||
0c3acf2bbb
|
|||
5e8f02f7c4
|
|||
7dab010604
|
|||
88d7aa0bf5
|
37
.drone.yml
37
.drone.yml
@@ -1,37 +0,0 @@
|
|||||||
---
|
|
||||||
kind: pipeline
|
|
||||||
type: docker
|
|
||||||
name: arm32 images
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
arch: arm
|
|
||||||
steps:
|
|
||||||
- name: squid image for dockerhub
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
repo: docker.io/b4tman/squid
|
|
||||||
auto_tag: true
|
|
||||||
auto_tag_suffix: armhf
|
|
||||||
pull_image: true
|
|
||||||
registry: docker.io
|
|
||||||
username: b4tman
|
|
||||||
password:
|
|
||||||
from_secret: docker_password
|
|
||||||
config:
|
|
||||||
from_secret: docker_config
|
|
||||||
- name: squid-armhf image for github packages
|
|
||||||
image: plugins/docker
|
|
||||||
settings:
|
|
||||||
repo: ghcr.io/b4tman/squid-armhf
|
|
||||||
auto_tag: true
|
|
||||||
pull_image: true
|
|
||||||
registry: ghcr.io
|
|
||||||
username: b4tman
|
|
||||||
password:
|
|
||||||
from_secret: github_password
|
|
||||||
config:
|
|
||||||
from_secret: docker_config
|
|
||||||
trigger:
|
|
||||||
ref:
|
|
||||||
- refs/tags/**
|
|
||||||
- refs/heads/master
|
|
14
.github/dependabot.yml
vendored
14
.github/dependabot.yml
vendored
@@ -1,14 +0,0 @@
|
|||||||
version: 2
|
|
||||||
updates:
|
|
||||||
- package-ecosystem: docker
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: monthly
|
|
||||||
time: "02:00"
|
|
||||||
open-pull-requests-limit: 10
|
|
||||||
|
|
||||||
- package-ecosystem: "github-actions"
|
|
||||||
directory: "/"
|
|
||||||
schedule:
|
|
||||||
interval: monthly
|
|
||||||
time: "03:00"
|
|
300
.github/workflows/dockerimage.yml
vendored
300
.github/workflows/dockerimage.yml
vendored
@@ -4,230 +4,94 @@ on:
|
|||||||
push:
|
push:
|
||||||
# Publish `master` as Docker `latest` image.
|
# Publish `master` as Docker `latest` image.
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
- v5
|
|
||||||
|
|
||||||
# Publish `v1.2.3` tags as releases.
|
# Publish `v1.2.3` tags as releases.
|
||||||
tags:
|
tags:
|
||||||
- v*
|
- v*
|
||||||
|
|
||||||
# Run tests for PRs to `master` branch.
|
# Run tests for any PRs.
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
|
||||||
- "master"
|
|
||||||
|
|
||||||
env:
|
|
||||||
TEST_TAG: b4tman/squid:test
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-18.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Set up QEMU
|
- name: Checkout submodules
|
||||||
uses: docker/setup-qemu-action@v3
|
shell: bash
|
||||||
|
run: |
|
||||||
- name: Set up Docker Buildx
|
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
|
||||||
uses: docker/setup-buildx-action@v3
|
git submodule sync --recursive
|
||||||
|
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
|
||||||
- name: Login to DockerHub
|
|
||||||
if: github.event_name != 'pull_request'
|
- name: Build squid image
|
||||||
uses: docker/login-action@v3
|
run: docker build . --file Dockerfile --tag b4tman/squid
|
||||||
with:
|
|
||||||
username: b4tman
|
- name: Test image
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
run: docker-compose -f docker-compose.test.yml up sut
|
||||||
|
|
||||||
- name: Cache Docker layers
|
- name: Build 'ssl-bump' image
|
||||||
uses: actions/cache@v4.0.1
|
run: docker build ssl-bump --tag b4tman/squid:ssl-bump
|
||||||
with:
|
|
||||||
path: /tmp/.buildx-cache
|
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-buildx-
|
|
||||||
|
|
||||||
- name: Build squid image
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
push: false
|
|
||||||
load: true # automatically load the single-platform build result to docker images
|
|
||||||
tags: ${{ env.TEST_TAG }}
|
|
||||||
cache-from: type=local,src=/tmp/.buildx-cache
|
|
||||||
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
|
||||||
|
|
||||||
# Temp fix
|
|
||||||
# https://github.com/docker/build-push-action/issues/252
|
|
||||||
# https://github.com/moby/buildkit/issues/1896
|
|
||||||
- name: Move cache
|
|
||||||
run: |
|
|
||||||
rm -rf /tmp/.buildx-cache
|
|
||||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
|
||||||
|
|
||||||
- name: Test image
|
|
||||||
run: |
|
|
||||||
set -ex
|
|
||||||
docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
|
|
||||||
docker compose -f docker-compose.test.yml down
|
|
||||||
|
|
||||||
- name: set base image for 'ssl-bump'
|
|
||||||
run: |
|
|
||||||
sed -i "s%FROM b4tman/squid%FROM $TEST_TAG%" ssl-bump/Dockerfile
|
|
||||||
|
|
||||||
- name: Build 'ssl-bump' image
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
push: false
|
|
||||||
load: true
|
|
||||||
tags: ${{ env.TEST_TAG }}-ssl-bump
|
|
||||||
cache-from: type=local,src=/tmp/.buildx-cache
|
|
||||||
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
|
||||||
|
|
||||||
# Temp fix
|
|
||||||
# https://github.com/docker/build-push-action/issues/252
|
|
||||||
# https://github.com/moby/buildkit/issues/1896
|
|
||||||
- name: Move cache
|
|
||||||
run: |
|
|
||||||
rm -rf /tmp/.buildx-cache
|
|
||||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
|
||||||
|
|
||||||
- name: Test 'ssl-bump' image
|
|
||||||
run: |
|
|
||||||
set -ex
|
|
||||||
TEST_TAG="${TEST_TAG}-ssl-bump" docker compose -f docker-compose.test.yml up --pull never sut --exit-code-from sut
|
|
||||||
docker compose -f docker-compose.test.yml down
|
|
||||||
push:
|
push:
|
||||||
needs: test
|
needs: test
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-18.04
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name == 'push'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Docker meta
|
- name: Checkout submodules
|
||||||
id: meta
|
shell: bash
|
||||||
uses: docker/metadata-action@v5
|
run: |
|
||||||
with:
|
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
|
||||||
images: |
|
git submodule sync --recursive
|
||||||
b4tman/squid
|
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
|
||||||
ghcr.io/b4tman/squid
|
|
||||||
flavor: |
|
- name: Build squid image
|
||||||
latest=${{ github.ref == 'refs/heads/master' }}
|
run: docker build . --file Dockerfile --tag b4tman/squid
|
||||||
tags: |
|
|
||||||
type=ref,event=branch
|
- name: Build 'ssl-bump' image
|
||||||
type=semver,pattern={{version}}
|
run: docker build ssl-bump --tag b4tman/squid:ssl-bump
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
|
- name: Log into registry
|
||||||
- name: Docker meta (ssl-bump)
|
run: echo "${{ secrets.GITHUB_PKGS_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
|
||||||
id: meta_ssl_bump
|
|
||||||
uses: docker/metadata-action@v5
|
- name: Push squid image
|
||||||
with:
|
run: |
|
||||||
images: |
|
IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/squid
|
||||||
b4tman/squid
|
|
||||||
ghcr.io/b4tman/squid
|
# Strip git ref prefix from version
|
||||||
flavor: |
|
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
|
||||||
latest=false
|
|
||||||
suffix=-ssl-bump
|
# Strip "v" prefix from tag name
|
||||||
tags: |
|
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
|
||||||
type=ref,event=branch
|
|
||||||
type=semver,pattern={{version}}
|
# Use Docker `latest` tag convention
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
[ "$VERSION" == "master" ] && VERSION=latest
|
||||||
|
|
||||||
- name: Docker meta (ssl-bump ghcr)
|
echo IMAGE_ID=$IMAGE_ID
|
||||||
id: meta_ssl_bump_ghcr
|
echo VERSION=$VERSION
|
||||||
uses: docker/metadata-action@v5
|
|
||||||
with:
|
docker tag b4tman/squid $IMAGE_ID:$VERSION
|
||||||
images: |
|
docker push $IMAGE_ID:$VERSION
|
||||||
ghcr.io/b4tman/squid-ssl-bump
|
|
||||||
flavor: |
|
- name: Push 'ssl-bump' image
|
||||||
latest=${{ github.ref == 'refs/heads/master' }}
|
run: |
|
||||||
tags: |
|
IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/ssl-bump
|
||||||
type=ref,event=branch
|
|
||||||
type=semver,pattern={{version}}
|
# Strip git ref prefix from version
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
|
||||||
|
|
||||||
- name: Set up QEMU
|
# Strip "v" prefix from tag name
|
||||||
uses: docker/setup-qemu-action@v3
|
[[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
# Use Docker `latest` tag convention
|
||||||
uses: docker/setup-buildx-action@v3
|
[ "$VERSION" == "master" ] && VERSION=latest
|
||||||
|
|
||||||
- name: Cache Docker layers
|
echo IMAGE_ID=$IMAGE_ID
|
||||||
uses: actions/cache@v4.0.1
|
echo VERSION=$VERSION
|
||||||
with:
|
|
||||||
path: /tmp/.buildx-cache
|
docker tag b4tman/squid:ssl-bump $IMAGE_ID:$VERSION
|
||||||
key: ${{ runner.os }}-buildx-${{ github.sha }}
|
docker push $IMAGE_ID:$VERSION
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-buildx-
|
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: b4tman
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Login to GHCR
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.repository_owner }}
|
|
||||||
password: ${{ secrets.CR_PAT }}
|
|
||||||
|
|
||||||
- name: Build squid image
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
push: true
|
|
||||||
platforms: linux/amd64,linux/arm/v7
|
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
|
||||||
cache-from: type=local,src=/tmp/.buildx-cache
|
|
||||||
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
|
||||||
|
|
||||||
# Temp fix
|
|
||||||
# https://github.com/docker/build-push-action/issues/252
|
|
||||||
# https://github.com/moby/buildkit/issues/1896
|
|
||||||
- name: Move cache
|
|
||||||
run: |
|
|
||||||
rm -rf /tmp/.buildx-cache
|
|
||||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
|
||||||
|
|
||||||
- name: Build 'ssl-bump' image
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: ssl-bump
|
|
||||||
push: true
|
|
||||||
file: ssl-bump/Dockerfile
|
|
||||||
platforms: linux/amd64,linux/arm/v7
|
|
||||||
tags: ${{ steps.meta_ssl_bump.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta_ssl_bump.outputs.labels }}
|
|
||||||
cache-from: type=local,src=/tmp/.buildx-cache
|
|
||||||
cache-to: type=local,dest=/tmp/.buildx-cache-new
|
|
||||||
|
|
||||||
# Temp fix
|
|
||||||
# https://github.com/docker/build-push-action/issues/252
|
|
||||||
# https://github.com/moby/buildkit/issues/1896
|
|
||||||
- name: Move cache
|
|
||||||
run: |
|
|
||||||
rm -rf /tmp/.buildx-cache
|
|
||||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
|
||||||
|
|
||||||
- name: Build 'ssl-bump' image for ghcr
|
|
||||||
uses: docker/build-push-action@v5
|
|
||||||
with:
|
|
||||||
context: ssl-bump
|
|
||||||
push: true
|
|
||||||
file: ssl-bump/Dockerfile
|
|
||||||
platforms: linux/amd64,linux/arm/v7
|
|
||||||
tags: ${{ steps.meta_ssl_bump_ghcr.outputs.tags }}
|
|
||||||
labels: ${{ steps.meta_ssl_bump_ghcr.outputs.labels }}
|
|
||||||
cache-from: type=local,src=/tmp/.buildx-cache
|
|
||||||
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
|
||||||
|
|
||||||
# Temp fix
|
|
||||||
# https://github.com/docker/build-push-action/issues/252
|
|
||||||
# https://github.com/moby/buildkit/issues/1896
|
|
||||||
- name: Move cache
|
|
||||||
run: |
|
|
||||||
rm -rf /tmp/.buildx-cache
|
|
||||||
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
|
|
||||||
|
28
.github/workflows/stale.yml
vendored
28
.github/workflows/stale.yml
vendored
@@ -1,28 +0,0 @@
|
|||||||
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
|
|
||||||
#
|
|
||||||
# You can adjust the behavior by modifying this file.
|
|
||||||
# For more information, see:
|
|
||||||
# https://github.com/actions/stale
|
|
||||||
name: Mark stale issues and pull requests
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: '0 1 * * *'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
stale:
|
|
||||||
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
issues: write
|
|
||||||
pull-requests: write
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/stale@v9
|
|
||||||
with:
|
|
||||||
days-before-stale: 182
|
|
||||||
days-before-close: 7
|
|
||||||
stale-issue-message: 'Marking stale due to inactivity. Remove stale label or comment or this will be closed in 7 days.'
|
|
||||||
close-issue-message: 'Closing due to inactivity.'
|
|
||||||
stale-pr-message: 'Marking stale due to inactivity. Remove stale label or comment or this will be closed in 7 days.'
|
|
||||||
close-pr-message: 'Closing due to inactivity.'
|
|
4
.gitmodules
vendored
Normal file
4
.gitmodules
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
[submodule "squid"]
|
||||||
|
path = squid
|
||||||
|
url = https://github.com/squid-cache/squid
|
||||||
|
branch = v5
|
91
Dockerfile
91
Dockerfile
@@ -1,6 +1,4 @@
|
|||||||
FROM alpine:3.19.1 as build
|
FROM alpine:3.11.3 as build
|
||||||
|
|
||||||
ARG SQUID_VER=6.8
|
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
@@ -9,8 +7,7 @@ RUN set -x && \
|
|||||||
libc-dev \
|
libc-dev \
|
||||||
curl \
|
curl \
|
||||||
gnupg \
|
gnupg \
|
||||||
openssl-dev \
|
libressl-dev \
|
||||||
openssl-libs-static \
|
|
||||||
perl-dev \
|
perl-dev \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
@@ -21,33 +18,22 @@ RUN set -x && \
|
|||||||
libcap-dev \
|
libcap-dev \
|
||||||
linux-headers
|
linux-headers
|
||||||
|
|
||||||
WORKDIR /tmp/build
|
COPY squid /tmp/build
|
||||||
|
WORKDIR /tmp/build/
|
||||||
RUN set -x && \
|
|
||||||
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
|
RUN sed -i 's/ed -s/ed/g' bootstrap.sh
|
||||||
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc
|
RUN ln -s /usr/bin/aclocal-1.16 /usr/bin/aclocal-1.15
|
||||||
|
RUN ln -s /usr/bin/automake-1.16 /usr/bin/automake-1.15
|
||||||
COPY squid-keys.asc /tmp/build
|
RUN sh bootstrap.sh
|
||||||
|
|
||||||
RUN set -x && \
|
RUN \
|
||||||
GNUPGHOME="$(mktemp -d)" && \
|
|
||||||
export GNUPGHOME && \
|
|
||||||
gpg --import squid-keys.asc && \
|
|
||||||
gpg --batch --verify squid-${SQUID_VER}.tar.gz.asc squid-${SQUID_VER}.tar.gz && \
|
|
||||||
rm -rf "$GNUPGHOME"
|
|
||||||
|
|
||||||
RUN set -x && \
|
|
||||||
tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \
|
|
||||||
\
|
|
||||||
MACHINE=$(uname -m) && \
|
|
||||||
\
|
|
||||||
CFLAGS="-g0 -O2" \
|
CFLAGS="-g0 -O2" \
|
||||||
CXXFLAGS="-g0 -O2" \
|
CXXFLAGS="-g0 -O2" \
|
||||||
LDFLAGS="-s" \
|
LDFLAGS="-s" \
|
||||||
\
|
\
|
||||||
./configure \
|
./configure \
|
||||||
--build="$MACHINE" \
|
--build="$(uname -m)" \
|
||||||
--host="$MACHINE" \
|
--host="$(uname -m)" \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--datadir=/usr/share/squid \
|
--datadir=/usr/share/squid \
|
||||||
--sysconfdir=/etc/squid \
|
--sysconfdir=/etc/squid \
|
||||||
@@ -58,12 +44,11 @@ RUN set -x && \
|
|||||||
--disable-arch-native \
|
--disable-arch-native \
|
||||||
--enable-removal-policies="lru,heap" \
|
--enable-removal-policies="lru,heap" \
|
||||||
--enable-auth-digest \
|
--enable-auth-digest \
|
||||||
--enable-auth-basic="getpwnam,NCSA,DB,RADIUS" \
|
--enable-auth-basic="getpwnam,NCSA" \
|
||||||
--enable-basic-auth-helpers="DB" \
|
|
||||||
--enable-epoll \
|
--enable-epoll \
|
||||||
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
|
--enable-external-acl-helpers="file_userip,unix_group,wbinfo_group" \
|
||||||
--enable-auth-ntlm="fake" \
|
--enable-auth-ntlm="fake" \
|
||||||
--enable-auth-negotiate="kerberos,wrapper" \
|
--enable-auth-negotiate="wrapper" \
|
||||||
--enable-silent-rules \
|
--enable-silent-rules \
|
||||||
--disable-mit \
|
--disable-mit \
|
||||||
--enable-heimdal \
|
--enable-heimdal \
|
||||||
@@ -86,7 +71,7 @@ RUN set -x && \
|
|||||||
--enable-storeio="diskd rock" \
|
--enable-storeio="diskd rock" \
|
||||||
--enable-ipv6 \
|
--enable-ipv6 \
|
||||||
--enable-translation \
|
--enable-translation \
|
||||||
--enable-snmp \
|
--disable-snmp \
|
||||||
--disable-dependency-tracking \
|
--disable-dependency-tracking \
|
||||||
--with-large-files \
|
--with-large-files \
|
||||||
--with-default-user=squid \
|
--with-default-user=squid \
|
||||||
@@ -94,19 +79,13 @@ RUN set -x && \
|
|||||||
--with-pidfile=/var/run/squid/squid.pid
|
--with-pidfile=/var/run/squid/squid.pid
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
nproc=$(n=$(nproc) ; max_n=6 ; echo $(( n <= max_n ? n : max_n )) ) && \
|
make -j $(grep -cs ^processor /proc/cpuinfo) && \
|
||||||
make -j $nproc && \
|
|
||||||
make install
|
make install
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
WORKDIR /tmp/build/tools/squidclient
|
FROM alpine:3.11.3
|
||||||
RUN make && make install-strip
|
|
||||||
|
|
||||||
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf && \
|
|
||||||
echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf
|
|
||||||
|
|
||||||
# --- --- --- --- --- --- --- --- ---
|
|
||||||
|
|
||||||
FROM alpine:3.19.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
|
||||||
@@ -119,31 +98,35 @@ RUN apk add --no-cache \
|
|||||||
libstdc++ \
|
libstdc++ \
|
||||||
heimdal-libs \
|
heimdal-libs \
|
||||||
libcap \
|
libcap \
|
||||||
libltdl \
|
libressl3.0-libcrypto \
|
||||||
tzdata
|
libressl3.0-libssl \
|
||||||
|
libltdl
|
||||||
|
|
||||||
COPY --from=build /etc/squid/ /etc/squid/
|
COPY --from=build /etc/squid/ /etc/squid/
|
||||||
COPY --from=build /usr/lib/squid/ /usr/lib/squid/
|
COPY --from=build /usr/lib/squid/ /usr/lib/squid/
|
||||||
COPY --from=build /usr/share/squid/ /usr/share/squid/
|
COPY --from=build /usr/share/squid/ /usr/share/squid/
|
||||||
COPY --from=build /usr/sbin/squid /usr/sbin/squid
|
COPY --from=build /usr/sbin/squid /usr/sbin/squid
|
||||||
COPY --from=build /usr/bin/squidclient /usr/bin/squidclient
|
|
||||||
|
|
||||||
COPY --chmod=755 run.sh /
|
|
||||||
|
|
||||||
RUN install -d -o squid -g squid \
|
RUN install -d -o squid -g squid \
|
||||||
/var/cache/squid \
|
/var/cache/squid \
|
||||||
/var/log/squid \
|
/var/log/squid \
|
||||||
/var/run/squid && \
|
/var/run/squid && \
|
||||||
chmod +x /usr/lib/squid/* && \
|
chmod +x /usr/lib/squid/*
|
||||||
install -d -m 755 -o squid -g squid \
|
|
||||||
|
RUN install -d -m 755 -o squid -g squid \
|
||||||
/etc/squid/conf.d \
|
/etc/squid/conf.d \
|
||||||
/etc/squid/conf.d.tail && \
|
/etc/squid/conf.d.tail
|
||||||
touch /etc/squid/conf.d/placeholder.conf
|
RUN touch /etc/squid/conf.d/placeholder.conf
|
||||||
COPY squid-log.conf /etc/squid/conf.d.tail/
|
COPY squid-log.conf /etc/squid/conf.d.tail/
|
||||||
|
|
||||||
VOLUME ["/var/cache/squid"]
|
RUN set -x && \
|
||||||
|
apk add --no-cache --virtual .tz alpine-conf tzdata && \
|
||||||
|
/sbin/setup-timezone -z $TZ && \
|
||||||
|
apk del .tz
|
||||||
|
|
||||||
|
VOLUME ["/var/cache/squid"]
|
||||||
EXPOSE 3128/tcp
|
EXPOSE 3128/tcp
|
||||||
|
|
||||||
USER squid
|
USER squid
|
||||||
|
|
||||||
CMD ["/run.sh"]
|
CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
|
||||||
|
15
README.md
15
README.md
@@ -1,17 +1,13 @@
|
|||||||
|
[](https://microbadger.com/images/b4tman/squid "Get your own image badge on microbadger.com")
|
||||||
|
[](https://dependabot.com)
|
||||||
|

|
||||||

|

|
||||||
|
|
||||||
# docker-squid
|
# docker-squid
|
||||||
|
|
||||||
Docker Squid container based on Alpine Linux.
|
Docker Squid container based on Alpine Linux.
|
||||||
|
|
||||||
Automated builds of the image are available on:
|
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/b4tman/squid).
|
||||||
|
|
||||||
- DockerHub:
|
|
||||||
- [b4tman/squid](https://hub.docker.com/r/b4tman/squid)
|
|
||||||
- Github:
|
|
||||||
- [ghcr.io/b4tman/squid](https://github.com/users/b4tman/packages/container/package/squid)
|
|
||||||
- [ghcr.io/b4tman/squid-armhf](https://github.com/users/b4tman/packages/container/package/squid-armhf)
|
|
||||||
- [ghcr.io/b4tman/squid-ssl-bump](https://github.com/users/b4tman/packages/container/package/squid-ssl-bump)
|
|
||||||
|
|
||||||
# Quick Start
|
# Quick Start
|
||||||
|
|
||||||
@@ -34,6 +30,7 @@ docker-compose up
|
|||||||
|
|
||||||
- **SQUID_CONFIG_FILE**: Specify the configuration file for squid. Defaults to `/etc/squid/squid.conf`.
|
- **SQUID_CONFIG_FILE**: Specify the configuration file for squid. Defaults to `/etc/squid/squid.conf`.
|
||||||
|
|
||||||
|
|
||||||
## Example:
|
## Example:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -43,4 +40,4 @@ docker run -p 3128:3128 \
|
|||||||
b4tman/squid
|
b4tman/squid
|
||||||
```
|
```
|
||||||
|
|
||||||
This will start a squid container with your config file `/srv/docker/squid/squid.conf`.
|
This will start a squid container with your config file `/srv/docker/squid/squid.conf`.
|
||||||
|
@@ -1,20 +1,11 @@
|
|||||||
version: '2.3'
|
version: '2'
|
||||||
services:
|
services:
|
||||||
proxy:
|
proxy:
|
||||||
image: "${TEST_TAG}"
|
build: .
|
||||||
volumes:
|
|
||||||
- './test_localnet.conf:/etc/squid/conf.d/test_localnet.conf:ro'
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD", "sh", "-exc", "squidclient -T 3 mgr:info 2> /dev/null | grep -qF '200 OK'"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 3s
|
|
||||||
retries: 5
|
|
||||||
start_period: 1s
|
|
||||||
sut:
|
sut:
|
||||||
image: "${TEST_TAG}"
|
image: alpine:3.10.1
|
||||||
links:
|
links:
|
||||||
- proxy
|
- proxy
|
||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
command: sh -exc "sleep 10 && squidclient -h proxy -T 3 'https://postman-echo.com/get?squidtest=ok' 2> /dev/null | grep -qF '200 OK'"
|
command: sh -exc "apk add --update curl && sleep 5 && exec curl --proxy http://proxy:3128 -I http://google.com/"
|
||||||
|
|
||||||
|
4
hooks/post_checkout
Normal file
4
hooks/post_checkout
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
git submodule update --init
|
||||||
|
|
14
run.sh
14
run.sh
@@ -1,14 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
# force remove pid
|
|
||||||
if [ -e /var/run/squid/squid.pid ]; then
|
|
||||||
rm -f /var/run/squid/squid.pid
|
|
||||||
fi
|
|
||||||
|
|
||||||
# init cache
|
|
||||||
/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
|
|
||||||
|
|
||||||
# run squid
|
|
||||||
exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1
|
|
1
squid
Submodule
1
squid
Submodule
Submodule squid added at f4ade365f8
2067
squid-keys.asc
2067
squid-keys.asc
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,4 @@
|
|||||||
FROM b4tman/squid
|
FROM b4tman/squid
|
||||||
|
|
||||||
COPY run.sh /
|
|
||||||
USER root
|
USER root
|
||||||
RUN chmod 755 /run.sh
|
CMD ["sh", "-c", "(test -d /var/cache/squid/ssl_db || /usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB) && /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
|
||||||
|
|
||||||
USER squid
|
|
||||||
|
|
||||||
CMD ["/run.sh"]
|
|
@@ -1,14 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
set -x
|
|
||||||
|
|
||||||
# init ssl_db
|
|
||||||
if [ ! -d /var/cache/squid/ssl_db ]; then
|
|
||||||
/usr/lib/squid/security_file_certgen -c -s /var/cache/squid/ssl_db -M 4MB
|
|
||||||
fi
|
|
||||||
|
|
||||||
# init cache
|
|
||||||
/usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -z
|
|
||||||
|
|
||||||
# run squid
|
|
||||||
exec /usr/sbin/squid -f "${SQUID_CONFIG_FILE}" --foreground -YCd 1
|
|
@@ -1,11 +0,0 @@
|
|||||||
acl localnet1 src 0.0.0.1-0.255.255.255 # RFC 1122 "this" network (LAN)
|
|
||||||
acl localnet1 src 10.0.0.0/8 # RFC 1918 local private network (LAN)
|
|
||||||
acl localnet1 src 100.64.0.0/10 # RFC 6598 shared address space (CGN)
|
|
||||||
acl localnet1 src 169.254.0.0/16 # RFC 3927 link-local (directly plugged) machines
|
|
||||||
acl localnet1 src 172.16.0.0/12 # RFC 1918 local private network (LAN)
|
|
||||||
acl localnet1 src 192.168.0.0/16 # RFC 1918 local private network (LAN)
|
|
||||||
acl localnet1 src fc00::/7 # RFC 4193 local private network range
|
|
||||||
acl localnet1 src fe80::/10 # RFC 4291 link-local (directly plugged) machines
|
|
||||||
|
|
||||||
http_access allow localnet1
|
|
||||||
http_access allow localhost manager
|
|
Reference in New Issue
Block a user