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

Append prepend conf.d (#11)

Browse Source 
impl #10

* separete conf.d folders

conf.d - for prepend
conf.d.tail - for append
This commit is contained in:
Dmitry Belyaev 2019-08-11 12:58:17 +03:00 committed by GitHub
parent e513e356c7
commit e2bc962b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -97,6 +97,9 @@ RUN set -x && \
cd /tmp/build && \ cd /tmp/build && \
make -j $(grep -cs ^processor /proc/cpuinfo) && \ make -j $(grep -cs ^processor /proc/cpuinfo) && \
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
FROM alpine:3.10.1 FROM alpine:3.10.1
@ -126,9 +129,11 @@ RUN install -d -o squid -g squid \
/var/run/squid && \ /var/run/squid && \
chmod +x /usr/lib/squid/* chmod +x /usr/lib/squid/*
RUN echo 'include /etc/squid/conf.d/*.conf' >> "$SQUID_CONFIG_FILE" && \ RUN install -d -m 755 -o squid -g squid \
install -d -m 755 -o squid -g squid /etc/squid/conf.d /etc/squid/conf.d \
COPY squid-log.conf /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 && \ RUN set -x && \
apk add --no-cache --virtual .tz alpine-conf tzdata && \ apk add --no-cache --virtual .tz alpine-conf tzdata && \