From 7d0ddddf1b0cd1816bad2b9ac851334096d72a6d Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:44:13 +0000 Subject: [PATCH 1/4] 24.03-lts update squid to 6.12 --- squid/6.12/24.03-lts/Dockerfile | 32 ++++++++++++++++++++++++++++++ squid/6.12/24.03-lts/entrypoint.sh | 23 +++++++++++++++++++++ squid/meta.yml | 4 +++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 squid/6.12/24.03-lts/Dockerfile create mode 100644 squid/6.12/24.03-lts/entrypoint.sh diff --git a/squid/6.12/24.03-lts/Dockerfile b/squid/6.12/24.03-lts/Dockerfile new file mode 100644 index 00000000..0861b62a --- /dev/null +++ b/squid/6.12/24.03-lts/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:24.03-lts +FROM ${BASE} + +ARG VERSION=6.12 +ARG SQUID_PREFIX=/usr/local/squid +RUN yum -y update && yum -y install wget gcc g++ make perl openssl && yum clean all && \ + wget -O squid.tar.bz2 http://www.squid-cache.org/Versions/v${VERSION%%.*}/squid-${VERSION}.tar.bz2 +RUN mkdir /squid && tar -jxvf squid.tar.bz2 -C /squid --strip-components 1 && \ + cd /squid && ./configure \ + --prefix=$SQUID_PREFIX \ + --enable-arp-acl \ + --enable-linux-netfilter \ + --enable-linux-tproxy \ + --enable-async-io=100 \ + --enable-poll \ + --enable-gnuregex && \ + make -j "$(nproc)" && make install && \ + rm -rf squid.tar.gz /squid && \ + ln -s $SQUID_PREFIX/sbin/* /usr/local/sbin/ && \ + useradd -M -s /sbin/nologin squid && \ + chown -R squid:squid $SQUID_PREFIX/var/ + +COPY entrypoint.sh /usr/local/bin/ +RUN sed -i '$a\cache_effective_user squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_effective_group squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\visible_hostname 192.168.0.101' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\max_filedescriptors 65536' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_dir ufs /usr/local/squid/var/cache/squid 100 16 256' $SQUID_PREFIX/etc/squid.conf && \ + chmod 755 /usr/local/bin/entrypoint.sh + +ENTRYPOINT [ "entrypoint.sh" ] +EXPOSE 3128 diff --git a/squid/6.12/24.03-lts/entrypoint.sh b/squid/6.12/24.03-lts/entrypoint.sh new file mode 100644 index 00000000..baf2cc58 --- /dev/null +++ b/squid/6.12/24.03-lts/entrypoint.sh @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +# allow arguments to be passed to squid +if [[ ${1:0:1} = '-' ]]; then + EXTRA_ARGS="$@" + set -- +elif [[ ${1} == squid || ${1} == $(which squid) ]]; then + EXTRA_ARGS="${@:2}" + set -- +fi + +# default behaviour is to launch squid +if [[ -z ${1} ]]; then + if [[ ! -d ${SQUID_CACHE_DIR}/00 ]]; then + echo "Initializing cache..." + $(which squid) -N -f /usr/local/squid/etc/squid.conf -z + fi + echo "Starting squid..." + exec $(which squid) -f /usr/local/squid/etc/squid.conf -NYCd 1 ${EXTRA_ARGS} +else + exec "$@" +fi diff --git a/squid/meta.yml b/squid/meta.yml index bc5afa36..eb6436a1 100644 --- a/squid/meta.yml +++ b/squid/meta.yml @@ -1,2 +1,4 @@ 6.8-oe2203sp3: - path: squid/6.8/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: squid/6.8/22.03-lts-sp3/Dockerfile +6.12-oe2403lts: + path: squid/6.12/24.03-lts/Dockerfile \ No newline at end of file -- Gitee From f795e9d5f76573f11cd719d90bbcdb9c8b62c7c5 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:44:38 +0000 Subject: [PATCH 2/4] 22.03-lts-sp3 update squid to 6.12 --- squid/6.12/22.03-lts-sp3/Dockerfile | 32 ++++++++++++++++++++++++++ squid/6.12/22.03-lts-sp3/entrypoint.sh | 23 ++++++++++++++++++ squid/meta.yml | 4 +++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 squid/6.12/22.03-lts-sp3/Dockerfile create mode 100644 squid/6.12/22.03-lts-sp3/entrypoint.sh diff --git a/squid/6.12/22.03-lts-sp3/Dockerfile b/squid/6.12/22.03-lts-sp3/Dockerfile new file mode 100644 index 00000000..b7266b04 --- /dev/null +++ b/squid/6.12/22.03-lts-sp3/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp3 +FROM ${BASE} + +ARG VERSION=6.12 +ARG SQUID_PREFIX=/usr/local/squid +RUN yum -y update && yum -y install wget gcc g++ make perl openssl && yum clean all && \ + wget -O squid.tar.bz2 http://www.squid-cache.org/Versions/v${VERSION%%.*}/squid-${VERSION}.tar.bz2 +RUN mkdir /squid && tar -jxvf squid.tar.bz2 -C /squid --strip-components 1 && \ + cd /squid && ./configure \ + --prefix=$SQUID_PREFIX \ + --enable-arp-acl \ + --enable-linux-netfilter \ + --enable-linux-tproxy \ + --enable-async-io=100 \ + --enable-poll \ + --enable-gnuregex && \ + make -j "$(nproc)" && make install && \ + rm -rf squid.tar.gz /squid && \ + ln -s $SQUID_PREFIX/sbin/* /usr/local/sbin/ && \ + useradd -M -s /sbin/nologin squid && \ + chown -R squid:squid $SQUID_PREFIX/var/ + +COPY entrypoint.sh /usr/local/bin/ +RUN sed -i '$a\cache_effective_user squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_effective_group squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\visible_hostname 192.168.0.101' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\max_filedescriptors 65536' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_dir ufs /usr/local/squid/var/cache/squid 100 16 256' $SQUID_PREFIX/etc/squid.conf && \ + chmod 755 /usr/local/bin/entrypoint.sh + +ENTRYPOINT [ "entrypoint.sh" ] +EXPOSE 3128 diff --git a/squid/6.12/22.03-lts-sp3/entrypoint.sh b/squid/6.12/22.03-lts-sp3/entrypoint.sh new file mode 100644 index 00000000..baf2cc58 --- /dev/null +++ b/squid/6.12/22.03-lts-sp3/entrypoint.sh @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +# allow arguments to be passed to squid +if [[ ${1:0:1} = '-' ]]; then + EXTRA_ARGS="$@" + set -- +elif [[ ${1} == squid || ${1} == $(which squid) ]]; then + EXTRA_ARGS="${@:2}" + set -- +fi + +# default behaviour is to launch squid +if [[ -z ${1} ]]; then + if [[ ! -d ${SQUID_CACHE_DIR}/00 ]]; then + echo "Initializing cache..." + $(which squid) -N -f /usr/local/squid/etc/squid.conf -z + fi + echo "Starting squid..." + exec $(which squid) -f /usr/local/squid/etc/squid.conf -NYCd 1 ${EXTRA_ARGS} +else + exec "$@" +fi diff --git a/squid/meta.yml b/squid/meta.yml index eb6436a1..9e73131f 100644 --- a/squid/meta.yml +++ b/squid/meta.yml @@ -1,4 +1,6 @@ 6.8-oe2203sp3: path: squid/6.8/22.03-lts-sp3/Dockerfile 6.12-oe2403lts: - path: squid/6.12/24.03-lts/Dockerfile \ No newline at end of file + path: squid/6.12/24.03-lts/Dockerfile +6.12-oe2203sp3: + path: squid/6.12/22.03-lts-sp3/Dockerfile \ No newline at end of file -- Gitee From 27cfd9cfcf293fcf18cb7bd86f3581d507609f2f Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:45:03 +0000 Subject: [PATCH 3/4] 22.03-lts-sp4 update squid to 6.12 --- squid/6.12/22.03-lts-sp4/Dockerfile | 32 ++++++++++++++++++++++++++ squid/6.12/22.03-lts-sp4/entrypoint.sh | 23 ++++++++++++++++++ squid/meta.yml | 4 +++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 squid/6.12/22.03-lts-sp4/Dockerfile create mode 100644 squid/6.12/22.03-lts-sp4/entrypoint.sh diff --git a/squid/6.12/22.03-lts-sp4/Dockerfile b/squid/6.12/22.03-lts-sp4/Dockerfile new file mode 100644 index 00000000..34b1ce86 --- /dev/null +++ b/squid/6.12/22.03-lts-sp4/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp4 +FROM ${BASE} + +ARG VERSION=6.12 +ARG SQUID_PREFIX=/usr/local/squid +RUN yum -y update && yum -y install wget gcc g++ make perl openssl && yum clean all && \ + wget -O squid.tar.bz2 http://www.squid-cache.org/Versions/v${VERSION%%.*}/squid-${VERSION}.tar.bz2 +RUN mkdir /squid && tar -jxvf squid.tar.bz2 -C /squid --strip-components 1 && \ + cd /squid && ./configure \ + --prefix=$SQUID_PREFIX \ + --enable-arp-acl \ + --enable-linux-netfilter \ + --enable-linux-tproxy \ + --enable-async-io=100 \ + --enable-poll \ + --enable-gnuregex && \ + make -j "$(nproc)" && make install && \ + rm -rf squid.tar.gz /squid && \ + ln -s $SQUID_PREFIX/sbin/* /usr/local/sbin/ && \ + useradd -M -s /sbin/nologin squid && \ + chown -R squid:squid $SQUID_PREFIX/var/ + +COPY entrypoint.sh /usr/local/bin/ +RUN sed -i '$a\cache_effective_user squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_effective_group squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\visible_hostname 192.168.0.101' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\max_filedescriptors 65536' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_dir ufs /usr/local/squid/var/cache/squid 100 16 256' $SQUID_PREFIX/etc/squid.conf && \ + chmod 755 /usr/local/bin/entrypoint.sh + +ENTRYPOINT [ "entrypoint.sh" ] +EXPOSE 3128 diff --git a/squid/6.12/22.03-lts-sp4/entrypoint.sh b/squid/6.12/22.03-lts-sp4/entrypoint.sh new file mode 100644 index 00000000..baf2cc58 --- /dev/null +++ b/squid/6.12/22.03-lts-sp4/entrypoint.sh @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +# allow arguments to be passed to squid +if [[ ${1:0:1} = '-' ]]; then + EXTRA_ARGS="$@" + set -- +elif [[ ${1} == squid || ${1} == $(which squid) ]]; then + EXTRA_ARGS="${@:2}" + set -- +fi + +# default behaviour is to launch squid +if [[ -z ${1} ]]; then + if [[ ! -d ${SQUID_CACHE_DIR}/00 ]]; then + echo "Initializing cache..." + $(which squid) -N -f /usr/local/squid/etc/squid.conf -z + fi + echo "Starting squid..." + exec $(which squid) -f /usr/local/squid/etc/squid.conf -NYCd 1 ${EXTRA_ARGS} +else + exec "$@" +fi diff --git a/squid/meta.yml b/squid/meta.yml index 9e73131f..ca8206d3 100644 --- a/squid/meta.yml +++ b/squid/meta.yml @@ -3,4 +3,6 @@ 6.12-oe2403lts: path: squid/6.12/24.03-lts/Dockerfile 6.12-oe2203sp3: - path: squid/6.12/22.03-lts-sp3/Dockerfile \ No newline at end of file + path: squid/6.12/22.03-lts-sp3/Dockerfile +6.12-oe2203sp4: + path: squid/6.12/22.03-lts-sp4/Dockerfile \ No newline at end of file -- Gitee From 0449e3449522f9e277a83b850a97d7175416f909 Mon Sep 17 00:00:00 2001 From: openeuler_bot <673672685@qq.com> Date: Tue, 29 Oct 2024 00:45:30 +0000 Subject: [PATCH 4/4] 22.03-lts-sp1 update squid to 6.12 --- squid/6.12/22.03-lts-sp1/Dockerfile | 32 ++++++++++++++++++++++++++ squid/6.12/22.03-lts-sp1/entrypoint.sh | 23 ++++++++++++++++++ squid/meta.yml | 4 +++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 squid/6.12/22.03-lts-sp1/Dockerfile create mode 100644 squid/6.12/22.03-lts-sp1/entrypoint.sh diff --git a/squid/6.12/22.03-lts-sp1/Dockerfile b/squid/6.12/22.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..698bbd6c --- /dev/null +++ b/squid/6.12/22.03-lts-sp1/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:22.03-lts-sp1 +FROM ${BASE} + +ARG VERSION=6.12 +ARG SQUID_PREFIX=/usr/local/squid +RUN yum -y update && yum -y install wget gcc g++ make perl openssl && yum clean all && \ + wget -O squid.tar.bz2 http://www.squid-cache.org/Versions/v${VERSION%%.*}/squid-${VERSION}.tar.bz2 +RUN mkdir /squid && tar -jxvf squid.tar.bz2 -C /squid --strip-components 1 && \ + cd /squid && ./configure \ + --prefix=$SQUID_PREFIX \ + --enable-arp-acl \ + --enable-linux-netfilter \ + --enable-linux-tproxy \ + --enable-async-io=100 \ + --enable-poll \ + --enable-gnuregex && \ + make -j "$(nproc)" && make install && \ + rm -rf squid.tar.gz /squid && \ + ln -s $SQUID_PREFIX/sbin/* /usr/local/sbin/ && \ + useradd -M -s /sbin/nologin squid && \ + chown -R squid:squid $SQUID_PREFIX/var/ + +COPY entrypoint.sh /usr/local/bin/ +RUN sed -i '$a\cache_effective_user squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_effective_group squid' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\visible_hostname 192.168.0.101' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\max_filedescriptors 65536' $SQUID_PREFIX/etc/squid.conf && \ + sed -i '$a\cache_dir ufs /usr/local/squid/var/cache/squid 100 16 256' $SQUID_PREFIX/etc/squid.conf && \ + chmod 755 /usr/local/bin/entrypoint.sh + +ENTRYPOINT [ "entrypoint.sh" ] +EXPOSE 3128 diff --git a/squid/6.12/22.03-lts-sp1/entrypoint.sh b/squid/6.12/22.03-lts-sp1/entrypoint.sh new file mode 100644 index 00000000..baf2cc58 --- /dev/null +++ b/squid/6.12/22.03-lts-sp1/entrypoint.sh @@ -0,0 +1,23 @@ +#!/bin/sh +set -e + +# allow arguments to be passed to squid +if [[ ${1:0:1} = '-' ]]; then + EXTRA_ARGS="$@" + set -- +elif [[ ${1} == squid || ${1} == $(which squid) ]]; then + EXTRA_ARGS="${@:2}" + set -- +fi + +# default behaviour is to launch squid +if [[ -z ${1} ]]; then + if [[ ! -d ${SQUID_CACHE_DIR}/00 ]]; then + echo "Initializing cache..." + $(which squid) -N -f /usr/local/squid/etc/squid.conf -z + fi + echo "Starting squid..." + exec $(which squid) -f /usr/local/squid/etc/squid.conf -NYCd 1 ${EXTRA_ARGS} +else + exec "$@" +fi diff --git a/squid/meta.yml b/squid/meta.yml index ca8206d3..5d88206f 100644 --- a/squid/meta.yml +++ b/squid/meta.yml @@ -5,4 +5,6 @@ 6.12-oe2203sp3: path: squid/6.12/22.03-lts-sp3/Dockerfile 6.12-oe2203sp4: - path: squid/6.12/22.03-lts-sp4/Dockerfile \ No newline at end of file + path: squid/6.12/22.03-lts-sp4/Dockerfile +6.12-oe2203sp1: + path: squid/6.12/22.03-lts-sp1/Dockerfile \ No newline at end of file -- Gitee