b4tman/docker-squid
1
0
Fork 0
mirror of https://github.com/b4tman/docker-squid.git synced 2024-11-22 11:16:55 +00:00
Code Issues Packages Releases Activity

refactor Dockerfile

Browse Source
This commit is contained in:
Dmitry Belyaev 2023-03-01 14:30:21 +03:00
parent 23eacf4e57
commit 0db0d2b19d
Signed by: b4tman
GPG Key ID: 41A00BF15EA7E5F3
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Dockerfile
View File

@ -1,6 +1,6 @@
FROM alpine:3.17.2 as build FROM alpine:3.17.2 as build
ENV SQUID_VER 5.7 ARG SQUID_VER=5.7
RUN set -x && \ RUN set -x && \
apk add --no-cache \ apk add --no-cache \
@ -21,32 +21,33 @@ RUN set -x && \
libcap-dev \ libcap-dev \
linux-headers linux-headers
WORKDIR /tmp/build
RUN set -x && \ RUN set -x && \
mkdir -p /tmp/build && \
cd /tmp/build && \
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-${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.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
COPY squid-keys.asc /tmp COPY squid-keys.asc /tmp/build
RUN set -x && \ RUN set -x && \
cd /tmp/build && \ GNUPGHOME="$(mktemp -d)" && \
export GNUPGHOME="$(mktemp -d)" && \ export GNUPGHOME && \
gpg --import /tmp/squid-keys.asc && \ 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.gz.asc squid-${SQUID_VER}.tar.gz && \
rm -rf "$GNUPGHOME" rm -rf "$GNUPGHOME"
RUN set -x && \ RUN set -x && \
cd /tmp/build && \
tar --strip 1 -xzf squid-${SQUID_VER}.tar.gz && \ 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="$(uname -m)" \ --build="$MACHINE" \
--host="$(uname -m)" \ --host="$MACHINE" \
--prefix=/usr \ --prefix=/usr \
--datadir=/usr/share/squid \ --datadir=/usr/share/squid \
--sysconfdir=/etc/squid \ --sysconfdir=/etc/squid \
@ -92,16 +93,18 @@ RUN set -x && \
--with-openssl \ --with-openssl \
--with-pidfile=/var/run/squid/squid.pid --with-pidfile=/var/run/squid/squid.pid
RUN set -x && \ RUN set -x && \
cd /tmp/build && \ nproc=$(n=$(nproc) ; max_n=6 ; echo $(( n <= max_n ? n : max_n )) ) && \
nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \
make -j $nproc && \ make -j $nproc && \
make install && \ make install
cd tools/squidclient && make && make install-strip
RUN sed -i '1s;^;include /etc/squid/conf.d/*.conf\n;' /etc/squid/squid.conf WORKDIR /tmp/build/tools/squidclient
RUN echo 'include /etc/squid/conf.d.tail/*.conf' >> /etc/squid/squid.conf 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.17.2 FROM alpine:3.17.2
@ -124,17 +127,15 @@ 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 --from=build /usr/bin/squidclient /usr/bin/squidclient
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 && \
RUN touch /etc/squid/conf.d/placeholder.conf 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/
RUN set -x && \ RUN set -x && \