diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 945c999..2a2410b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -45,10 +45,6 @@ jobs: with: cosign-release: 'v2.2.4' - - - name: Docker Setup QEMU - uses: docker/setup-qemu-action@v3.2.0 - # Set up BuildKit Docker container builder to be able to build # multi-platform images and export cache # https://github.com/docker/setup-buildx-action @@ -80,7 +76,6 @@ jobs: uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0 with: context: . - platforms: linux/arm64/v8,linux/amd64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index a058b02..317cb7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,8 @@ FROM --platform=$BUILDPLATFORM debian:bullseye AS builder ARG DEBIAN_FRONTEND=noninteractive -ENV SOURCEURL=http://www.squid-cache.org/Versions/v4/squid-4.17.tar.gz +ENV SOURCEURL=https://www.squid-cache.org/Versions/v6/squid-6.12.tar.gz +ENV LANGPACKURL=https://www.squid-cache.org/Versions/langpack/squid-langpack-20240307.tar.gz ENV builddeps=" \ build-essential \ @@ -45,6 +46,7 @@ RUN echo "deb-src http://deb.debian.org/debian bullseye main" > /etc/apt/sources WORKDIR /build RUN curl -o /build/squid-source.tar.gz ${SOURCEURL} \ + && curl -o /build/squid-langpack.tar.gz ${LANGPACKURL} \ && tar --strip=1 -xf squid-source.tar.gz RUN ./configure --prefix=/usr \ @@ -69,7 +71,7 @@ RUN ./configure --prefix=/usr \ --enable-auth-digest="file,LDAP" \ --enable-auth-negotiate="kerberos,wrapper" \ --enable-auth-ntlm="fake,SMB_LM" \ - --enable-external-acl-helpers="file_userip,kerberos_ldap_group,LDAP_group,session,SQL_session,time_quota,unix_group,wbinfo_group" \ + --enable-external-acl-helpers="file_userip,kerberos_ldap_group,LDAP_group,session,SQL_session,unix_group,wbinfo_group" \ --enable-url-rewrite-helpers="fake" \ --enable-eui \ --enable-esi \ @@ -96,6 +98,13 @@ RUN apt update \ && apt -qy install libssl1.1 /tmp/squid.deb \ && rm -rf /var/lib/apt/lists/* +# Install language pack +COPY --from=builder /build/squid-langpack.tar.gz /tmp/squid-langpack.tar.gz +RUN cd /usr/share/squid/errors \ + && tar -xf /tmp/squid-langpack.tar.gz \ + && rm -rf /tmp/squid-langpack.tar.gz \ + && /usr/share/squid/errors/alias-link.sh /bin/ln /bin/rm /usr/share/squid/errors /usr/share/squid/errors/aliases + COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN chmod +x /usr/local/bin/docker-entrypoint.sh