mirror of
https://github.com/b4tman/docker-squid.git
synced 2024-11-22 19:26:54 +00:00
upd to squid v4.0.19
This commit is contained in:
parent
f14696a355
commit
d059b7d2cd
21
Dockerfile
21
Dockerfile
@ -1,8 +1,8 @@
|
|||||||
FROM alpine:3.5
|
FROM alpine:3.5
|
||||||
MAINTAINER b4tman <b4tm4n@mail.ru>
|
MAINTAINER b4tman <b4tm4n@mail.ru>
|
||||||
|
|
||||||
ENV SQUID_VER 3.5.25
|
ENV SQUID_VER 4.0.19
|
||||||
ENV SQUID_SIG_KEY EA31CC5E9488E5168D2DCC5EB268E706FF5CF463
|
ENV SQUID_SIG_KEY B06884EDB779C89B044E64E3CD6DBF8EF3B17D3E
|
||||||
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
ENV SQUID_CONFIG_FILE /etc/squid/squid.conf
|
||||||
ENV TZ Europe/Moscow
|
ENV TZ Europe/Moscow
|
||||||
|
|
||||||
@ -12,10 +12,9 @@ RUN set -x && \
|
|||||||
|
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
heimdal-libs \
|
|
||||||
libcap \
|
libcap \
|
||||||
libressl2.4-libcrypto \
|
libcrypto1.0 \
|
||||||
libressl2.4-libssl \
|
libssl1.0 \
|
||||||
libltdl
|
libltdl
|
||||||
|
|
||||||
RUN set -x && \
|
RUN set -x && \
|
||||||
@ -27,21 +26,20 @@ RUN set -x && \
|
|||||||
tzdata \
|
tzdata \
|
||||||
curl \
|
curl \
|
||||||
gnupg \
|
gnupg \
|
||||||
libressl-dev \
|
openssl-dev \
|
||||||
perl-dev \
|
perl-dev \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
make \
|
make \
|
||||||
pkgconfig \
|
pkgconfig \
|
||||||
heimdal-dev \
|
|
||||||
libtool \
|
libtool \
|
||||||
libcap-dev \
|
libcap-dev \
|
||||||
linux-headers && \
|
linux-headers && \
|
||||||
\
|
\
|
||||||
mkdir -p /tmp/build && \
|
mkdir -p /tmp/build && \
|
||||||
cd /tmp/build && \
|
cd /tmp/build && \
|
||||||
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
|
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz -o squid-${SQUID_VER}.tar.gz && \
|
||||||
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/${SQUID_VER%.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc && \
|
curl -SsL http://www.squid-cache.org/Versions/v${SQUID_VER%.*.*}/squid-${SQUID_VER}.tar.gz.asc -o squid-${SQUID_VER}.tar.gz.asc && \
|
||||||
\
|
\
|
||||||
export GNUPGHOME="$(mktemp -d)" && \
|
export GNUPGHOME="$(mktemp -d)" && \
|
||||||
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY} && \
|
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SQUID_SIG_KEY} && \
|
||||||
@ -71,11 +69,12 @@ RUN set -x && \
|
|||||||
--enable-auth-negotiate="wrapper" \
|
--enable-auth-negotiate="wrapper" \
|
||||||
--enable-silent-rules \
|
--enable-silent-rules \
|
||||||
--disable-mit \
|
--disable-mit \
|
||||||
--enable-heimdal \
|
--disable-heimdal \
|
||||||
--enable-delay-pools \
|
--enable-delay-pools \
|
||||||
--enable-arp-acl \
|
--enable-arp-acl \
|
||||||
--enable-openssl \
|
--enable-openssl \
|
||||||
--enable-ssl-crtd \
|
--enable-ssl-crtd \
|
||||||
|
--enable-security-cert-generators="file" \
|
||||||
--enable-ident-lookups \
|
--enable-ident-lookups \
|
||||||
--enable-useragent-log \
|
--enable-useragent-log \
|
||||||
--enable-cache-digests \
|
--enable-cache-digests \
|
||||||
@ -119,4 +118,4 @@ EXPOSE 3128/tcp
|
|||||||
|
|
||||||
USER squid
|
USER squid
|
||||||
|
|
||||||
CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} -NYCd 1"]
|
CMD ["sh", "-c", "/usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -z && exec /usr/sbin/squid -f ${SQUID_CONFIG_FILE} --foreground -YCd 1"]
|
||||||
|
Loading…
Reference in New Issue
Block a user