diff --git a/Dockerfile b/Dockerfile index 29bd2ab..b6ad254 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,8 +64,8 @@ RUN echo "deb-src http://deb.debian.org/debian buster main contrib" >> /etc/apt/ # Instal && cd /tmp/squid && apt-get install --no-install-recommends -y libxml2 ca-certificates \ && adduser --no-create-home --uid 1161 --group --system squid \ - && mkdir -p /usr/lib/squid/errors/French \ - && mkdir -p /usr/lib/squid/icons \ + && mkdir -p /usr/share/squid/errors/ \ + && mkdir -p /usr/share/squid/icons \ && mkdir /etc/squid/ \ && mkdir -p /var/spool/squid \ && mkdir -p /var/log/squid \ @@ -88,14 +88,14 @@ RUN echo "deb-src http://deb.debian.org/debian buster main contrib" >> /etc/apt/ && cp src/acl/external/unix_group/ext_unix_group_acl /usr/lib/squid/ \ && cp src/store/id_rewriters/file/storeid_file_rewrite /usr/lib/squid/ \ && cp src/DiskIO/DiskDaemon/diskd /usr/lib/squid/ \ - && cp -r icons/silk/ /usr/lib/squid/icons/silk/ \ - && cp icons/*.png /usr/lib/squid/icons/ \ + && cp -r icons/silk/ /usr/share/squid/icons/silk/ \ + && cp icons/*.png /usr/share/squid/icons/ \ # Audit de secu 05-03-2020 : on enleve les reference au MI et a squid dans les pages d'erreur && sed -i "s/Générée le %T par %h (%s)/Générée le %T par %h/g" errors/fr/* \ && sed -i 's/Votre administrateur proxy est %w<\/a>/Veuillez contacter le support SSI/g' errors/fr/* \ && sed -i "/SN.png/d" errors/errorpage.css \ && sed -i "s/background: url('http:\/\/www.squid-cache.org\/Artwork\/SN.png') no-repeat left;/\/\* background: url('http:\/\/www.squid-cache.org\/Artwork\/SN.png') no-repeat left; \*\//g" errors/errorpage.css \ - && cp errors/fr/* /usr/lib/squid/errors/French/ \ + && cp errors/* /usr/share/squid/errors/ \ && cp errors/errorpage.css /etc/squid \ && cp src/squid /usr/sbin/ \ && cp tools/squidclient/squidclient /usr/sbin/ \ @@ -106,7 +106,6 @@ RUN echo "deb-src http://deb.debian.org/debian buster main contrib" >> /etc/apt/ && chown -Rf squid /var/log/squid \ && chown -Rf squid /var/spool/squid \ && rm /etc/localtime \ - && ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \ # Clean && apt-get remove -y --purge libssl-dev wget make gcc g++ xz-utils libldap2-dev libpam0g-dev libdb-dev cdbs libsasl2-dev debhelper libcppunit-dev libkrb5-dev comerr-dev libcap2-dev libecap3-dev libexpat1-dev libxml2-dev autotools-dev libltdl-dev dpkg-dev pkg-config libnetfilter-conntrack-dev nettle-dev libgnutls28-dev lsb-release libldap2-dev libpam0g-dev libdb-dev cdbs libsasl2-dev debhelper libcppunit-dev libkrb5-dev comerr-dev libcap2-dev libecap3-dev libexpat1-dev libxml2-dev autotools-dev libltdl-dev dpkg-dev pkg-config libnetfilter-conntrack-dev nettle-dev libgnutls28-dev lsb-release \ && apt-get auto-remove -y && apt-get clean autoclean \