diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d4dd70..4e1aeb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,5 +24,4 @@ hadolint: before_script: - cd $CI_PROJECT_DIR script: - # - hadolint --ignore DL3008 Dockerfile-arm - hadolint --ignore DL3008 Dockerfile diff --git a/Dockerfile-arm b/Dockerfile-arm deleted file mode 100644 index f4be812..0000000 --- a/Dockerfile-arm +++ /dev/null @@ -1,116 +0,0 @@ -FROM debian:bullseye-slim - -ARG SQUID_VERSION -ENV ENV_SQUID_VERSION=$SQUID_VERSION - -WORKDIR /tmp -RUN echo "deb-src http://deb.debian.org/debian bullseye main contrib" >> /etc/apt/sources.list && apt-get update && apt-get --no-install-recommends -y build-dep squid && apt-get --no-install-recommends -y install wget tar xz-utils libssl-dev libssl1.1 winbind \ - && wget --progress=dot:giga http://www.squid-cache.org/Versions/v5/$SQUID_VERSION \ - && mkdir squid && tar -C squid --strip-components=1 -xzf $SQUID_VERSION \ - && cd squid \ - && ./configure \ - --prefix=/usr \ - --datadir=/usr/share/squid \ - --build=arm-linux-gnueabihf \ - --enable-cache-digests \ - --includedir=/usr/include \ - --program-prefix= \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib/squid \ - --localstatedir=/var \ - --sharedstatedir=/usr/com \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --enable-icap-client \ - --enable-icap-support \ - --enable-async-io \ - --with-pthreads \ - --with-winbind \ - --bindir=/usr/sbin \ - --sbindir=/usr/sbin \ - --with-squid=/usr/lib/squid \ - --disable-ipv6 \ - --enable-ltdl-convenience \ - --enable-http-violations \ - build_alias="arm-linux-gnueabihf" \ - CFLAGS="-g -O2 -g -Wall -O2" \ - LDFLAGS= \ - CPPFLAGS= \ - CXXFLAGS="-g -O2 -g -Wall -O2" \ - --without-netfilter-conntrack \ - --disable-arch-native \ - --enable-follow-x-forwarded-for \ - --enable-ssl \ - --enable-ssl-crtd \ - --with-openssl \ - --enable-storeio="aufs,diskd,ufs" \ - --exec-prefix=/usr \ - --enable-auth-basic="LDAP" \ - --enable-auth-digest="LDAP" \ - --enable-auth-ntlm \ - --enable-auth-negotiate \ - --enable-negotiate-auth-helpers \ - --with-krb5-config=yes \ - --enable-icap-client \ - --sysconfdir=/etc/squid \ - --with-filedescriptors=48000 \ - --enable-delay-pools \ - --with-large-files \ - --enable-removal-policies="lru,heap" \ - && make \ -# Instal - && apt-get install --no-install-recommends -y libxml2 ca-certificates \ - && adduser --no-create-home --uid 1161 --group --system squid \ - && mkdir -p /usr/share/squid \ - && mkdir -p /usr/lib/squid \ - && mkdir /etc/squid/ \ - && mkdir -p /var/log/squid \ - && mkdir -p /var/cache/squid \ - && cp src/auth/basic/LDAP/basic_ldap_auth /usr/lib/squid/ \ - && cp src/auth/digest/LDAP/digest_ldap_auth /usr/lib/squid/ \ - && cp src/auth/negotiate/kerberos/negotiate_kerberos_auth /usr/lib/squid/ \ - && cp src/log/DB/log_db_daemon /usr/lib/squid/ \ - && cp src/log/file/log_file_daemon /usr/lib/squid/ \ - && cp src/unlinkd /usr/lib/squid/ \ - && cp src/http/url_rewriters/LFS/url_lfs_rewrite /usr/lib/squid/ \ - && cp src/http/url_rewriters/fake/url_fake_rewrite /usr/lib/squid/ \ - && cp src/http/url_rewriters/fake/url_fake_rewrite.sh /usr/lib/squid/ \ - && cp src/mime.conf.default /usr/lib/squid/ \ - && cp src/security/cert_validators/fake/security_fake_certverify /usr/lib/squid/ \ - && cp src/security/cert_generators/file/security_file_certgen /usr/lib/squid/ \ - && cp src/acl/external/delayer/ext_delayer_acl /usr/lib/squid/ \ - && cp src/acl/external/SQL_session/ext_sql_session_acl /usr/lib/squid/ \ - && cp src/acl/external/wbinfo_group/ext_wbinfo_group_acl /usr/lib/squid/ \ - && cp src/acl/external/LDAP_group/ext_ldap_group_acl /usr/lib/squid/ \ - && cp src/acl/external/eDirectory_userip/ext_edirectory_userip_acl /usr/lib/squid/ \ - && 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 errors /usr/share/squid/ \ - && cp -r icons /usr/share/squid/ \ - && cp src/squid /usr/sbin/ \ - && cp tools/squidclient/squidclient /usr/sbin/ \ - && cp src/mime.conf.default /etc/squid/mime.conf \ - && cp src/squid.conf.default /etc/squid/squid.conf \ - && chown -Rf squid /etc/squid \ - && chown -Rf squid /usr/lib/squid \ - && chown -Rf squid /var/log/squid \ - && chown -Rf squid /var/cache/squid \ - && echo "cache_dir diskd /var/cache/squid/\${service_name} 130 51 51" >> /etc/squid/squid.conf \ - && echo "access_log stdio:/var/log/squid/access.log" >> /etc/squid/squid.conf \ - && echo "cache_log /var/log/squid/cache.log" >> /etc/squid/squid.conf \ - && echo "cache_effective_user squid" >> /etc/squid/squid.conf \ -# 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 \ -# Remove for first layer - && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* -# Packages dependencies installation for running and clean again -RUN apt-get update && apt-get install -y --no-install-recommends net-tools rsync libexpat1 libltdl7 libxml2 openssl ca-certificates libldap-2.4-2 libecap3 libdb5.3 libatomic1 \ - && rm -rf /var/lib/apt/lists/* && rm -Rf /tmp/* - -COPY run.sh / -RUN chmod +x /run.sh -HEALTHCHECK CMD squidclient -p 3128 || exit 1 -EXPOSE 3128 -ENTRYPOINT ["/run.sh"] diff --git a/gitlabci/docker-hub-arm.yml b/gitlabci/docker-hub-arm.yml index 3491386..071fc60 100644 --- a/gitlabci/docker-hub-arm.yml +++ b/gitlabci/docker-hub-arm.yml @@ -18,7 +18,7 @@ docker-hub-build-arm: - cd $CI_PROJECT_DIR - apk add --no-cache curl - export SQUID_VERSION=$(curl -s http://www.squid-cache.org/Versions/v5/ | egrep -m 1 -oh squid-.*.tar.gz | cut -d '"' -f1) - - docker build -f Dockerfile-arm --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM . + - docker build -f Dockerfile --build-arg SQUID_VERSION=$SQUID_VERSION --pull -t $CONTAINER_BUILD_NOPROD_NAME_ARM . - docker push $CONTAINER_BUILD_NOPROD_NAME_ARM .services-arm: