fix: wrong file name for config
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-08-04 21:02:21 +01:00
parent da89baf22d
commit e7e0811830
1 changed files with 2 additions and 3 deletions

View File

@ -2,7 +2,6 @@ FROM debian:8
RUN apt-get -y update RUN apt-get -y update
RUN apt-get install -y curl supervisor git openssl build-essential libssl-dev wget vim curl RUN apt-get install -y curl supervisor git openssl build-essential libssl-dev wget vim curl
RUN mkdir -p /var/log/supervisor RUN mkdir -p /var/log/supervisor
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
WORKDIR /apps/ WORKDIR /apps/
RUN wget -O - http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.gz | tar zxfv - \ RUN wget -O - http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.gz | tar zxfv - \
&& CPU=$(( `nproc --all`-1 )) \ && CPU=$(( `nproc --all`-1 )) \
@ -17,9 +16,9 @@ ADD . /apps/
RUN chown -R nobody:nogroup /apps/ RUN chown -R nobody:nogroup /apps/
RUN mkdir -p /apps/squid/var/lib/ RUN mkdir -p /apps/squid/var/lib/
RUN /apps/squid/libexec/ssl_crtd -c -s /apps/squid/var/lib/ssl_db -M 4MB RUN /apps/squid/libexec/ssl_crtd -c -s /apps/squid/var/lib/ssl_db -M 4MB
RUN /apps/squid/sbin/squid -z -f /apps/squid.conf.cache RUN /apps/squid/sbin/squid -z -f /apps/squid.intercept.conf
RUN chown -R nobody:nogroup /apps/ RUN chown -R nobody:nogroup /apps/
EXPOSE 3128 EXPOSE 3128
ENTRYPOINT ["/apps/squid/sbin/squid", "-NsY", "-f"] ENTRYPOINT ["/apps/squid/sbin/squid", "-NsY", "-f"]
CMD ["/apps/squid.conf.intercept"] CMD ["/apps/squid.intercept.conf"]