From ffaa8bc41890a3bc8d73798e4606dc0572b3df9d Mon Sep 17 00:00:00 2001 From: Fred Date: Wed, 8 Mar 2023 13:15:25 +0000 Subject: [PATCH] Move from buildamd to buildsquid --- Dockerfile | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d0748f..8e7561f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim as buildamd +FROM debian:bullseye-slim as buildsquid ARG SQUID_VERSION ENV ENV_SQUID_VERSION=$SQUID_VERSION WORKDIR /tmp @@ -59,32 +59,32 @@ RUN echo "deb-src http://deb.debian.org/debian bullseye main contrib" >> /etc/ap && find /tmp/ -type f -name "*.in" -delete # Install FROM debian:bullseye-slim -COPY --from=buildamd --chown=1161 /tmp/src/auth/basic/LDAP/basic_ldap_auth /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/auth/digest/LDAP/digest_ldap_auth /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/auth/negotiate/kerberos/negotiate_kerberos_auth /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/log/DB/log_db_daemon /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/log/file/log_file_daemon /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/unlinkd /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/http/url_rewriters/LFS/url_lfs_rewrite /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/http/url_rewriters/fake/url_fake_rewrite /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/http/url_rewriters/fake/url_fake_rewrite.sh /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/mime.conf.default /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/security/cert_validators/fake/security_fake_certverify /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/security/cert_generators/file/security_file_certgen /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/delayer/ext_delayer_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/SQL_session/ext_sql_session_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/wbinfo_group/ext_wbinfo_group_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/LDAP_group/ext_ldap_group_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/acl/external/unix_group/ext_unix_group_acl /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/store/id_rewriters/file/storeid_file_rewrite /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/src/DiskIO/DiskDaemon/diskd /usr/lib/squid/ -COPY --from=buildamd --chown=1161 /tmp/errors /usr/share/squid/errors -COPY --from=buildamd --chown=1161 /tmp/icons /usr/share/squid/icons -COPY --from=buildamd --chown=1161 /tmp/src/squid /usr/sbin/ -COPY --from=buildamd --chown=1161 /tmp/tools/squidclient/squidclient /usr/sbin/ -COPY --from=buildamd --chown=1161 /tmp/src/mime.conf.default /etc/squid/mime.conf -COPY --from=buildamd --chown=1161 /tmp/src/squid.conf.default /etc/squid/squid.conf +COPY --from=builddsquid --chown=1161 /tmp/src/auth/basic/LDAP/basic_ldap_auth /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/auth/digest/LDAP/digest_ldap_auth /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/auth/negotiate/kerberos/negotiate_kerberos_auth /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/log/DB/log_db_daemon /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/log/file/log_file_daemon /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/unlinkd /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/http/url_rewriters/LFS/url_lfs_rewrite /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/http/url_rewriters/fake/url_fake_rewrite /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/http/url_rewriters/fake/url_fake_rewrite.sh /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/mime.conf.default /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/security/cert_validators/fake/security_fake_certverify /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/security/cert_generators/file/security_file_certgen /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/delayer/ext_delayer_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/SQL_session/ext_sql_session_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/wbinfo_group/ext_wbinfo_group_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/LDAP_group/ext_ldap_group_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/eDirectory_userip/ext_edirectory_userip_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/acl/external/unix_group/ext_unix_group_acl /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/store/id_rewriters/file/storeid_file_rewrite /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/src/DiskIO/DiskDaemon/diskd /usr/lib/squid/ +COPY --from=buildsquid --chown=1161 /tmp/errors /usr/share/squid/errors +COPY --from=buildsquid --chown=1161 /tmp/icons /usr/share/squid/icons +COPY --from=buildsquid --chown=1161 /tmp/src/squid /usr/sbin/ +COPY --from=buildsquid --chown=1161 /tmp/tools/squidclient/squidclient /usr/sbin/ +COPY --from=buildsquid --chown=1161 /tmp/src/mime.conf.default /etc/squid/mime.conf +COPY --from=buildsquid --chown=1161 /tmp/src/squid.conf.default /etc/squid/squid.conf RUN adduser --no-create-home --uid 1161 --group --system squid \ && mkdir -p /usr/share/squid \ && mkdir -p /usr/lib/squid \