From 824146b6c68c8784257d049e36479cb263a7116a Mon Sep 17 00:00:00 2001 From: gianluca-mascolo Date: Sat, 3 Oct 2020 15:31:02 +0200 Subject: [PATCH] compile install squidclient --- Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 724807b..9281770 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,14 +93,16 @@ RUN set -x && \ --with-openssl \ --with-pidfile=/var/run/squid/squid.pid + RUN set -x && \ cd /tmp/build && \ - nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \ + nproc=$(n=$(nproc) ; max_n=6 ; [ $n -le $max_n ] && echo $n || echo $max_n) && \ make -j $nproc && \ - 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 + make install && \ + cd tools/squidclient && make && make install-strip + +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.12.0 @@ -123,6 +125,8 @@ COPY --from=build /etc/squid/ /etc/squid/ COPY --from=build /usr/lib/squid/ /usr/lib/squid/ COPY --from=build /usr/share/squid/ /usr/share/squid/ COPY --from=build /usr/sbin/squid /usr/sbin/squid +COPY --from=build /usr/bin/squidclient /usr/bin/squidclient + RUN install -d -o squid -g squid \ /var/cache/squid \