Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Append prepend conf.d #11

Merged
merged 5 commits into from
Aug 11, 2019
Merged

Append prepend conf.d #11

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d48860e
move "conf.d append" layer to "build" stage
b4tman Aug 10, 2019
d887703
change conf.d append files prefix
b4tman Aug 10, 2019
d8887c7
add conf.d prepend include
b4tman Aug 10, 2019
8ef3ff3
separete conf.d folders
b4tman Aug 11, 2019
2bcd70c
add placeholder to conf.d
b4tman Aug 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 && \
Expand Down