From e2bc962b39e1df1506e0fd43b4ce2d73a9101154 Mon Sep 17 00:00:00 2001 From: Dmitry Belyaev Date: Sun, 11 Aug 2019 12:58:17 +0300 Subject: [PATCH] Append prepend conf.d (#11) impl #10 * separete conf.d folders conf.d - for prepend conf.d.tail - for append --- Dockerfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c80c8d9..3dc0083 100644 --- a/Dockerfile +++ b/Dockerfile @@ -97,6 +97,9 @@ RUN set -x && \ cd /tmp/build && \ make -j $(grep -cs ^processor /proc/cpuinfo) && \ 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 FROM alpine:3.10.1 @@ -126,9 +129,11 @@ RUN install -d -o squid -g squid \ /var/run/squid && \ chmod +x /usr/lib/squid/* -RUN echo 'include /etc/squid/conf.d/*.conf' >> "$SQUID_CONFIG_FILE" && \ - install -d -m 755 -o squid -g squid /etc/squid/conf.d -COPY squid-log.conf /etc/squid/conf.d/ +RUN install -d -m 755 -o squid -g squid \ + /etc/squid/conf.d \ + /etc/squid/conf.d.tail +RUN touch /etc/squid/conf.d/placeholder.conf +COPY squid-log.conf /etc/squid/conf.d.tail/ RUN set -x && \ apk add --no-cache --virtual .tz alpine-conf tzdata && \