From cb6c0202f7142c80d5b9f3223f487d7ec25b6b21 Mon Sep 17 00:00:00 2001 From: pku-ops22 Date: Tue, 19 May 2026 15:36:16 +0800 Subject: [PATCH] update --- alpine/Dockerfile-3.23 | 14 ++++++++++++++ nginx/Dockerfile-latest | 5 +++-- nginx/nginx.sh | 2 +- redis/ADD/ccmd | 13 +++++++------ redis/Dockerfile-5 | 10 ++++++++++ redis/{Dockerfile => Dockerfile-6} | 3 +-- redis/redis.sh | 5 +++-- 7 files changed, 39 insertions(+), 13 deletions(-) create mode 100644 alpine/Dockerfile-3.23 create mode 100644 redis/Dockerfile-5 rename redis/{Dockerfile => Dockerfile-6} (72%) diff --git a/alpine/Dockerfile-3.23 b/alpine/Dockerfile-3.23 new file mode 100644 index 0000000..1c6f580 --- /dev/null +++ b/alpine/Dockerfile-3.23 @@ -0,0 +1,14 @@ +FROM alpine:3.23 +MAINTAINER Colben colbenlee@gmail.com +ADD --chown=root:root /ADD/ /etc/ +RUN echo -e 'https://mirrors.nju.edu.cn/alpine/v3.23/main\n\ +https://mirrors.nju.edu.cn/alpine/v3.23/community\n\ +' > /etc/apk/repositories \ + && apk update \ + && apk add --no-cache bash curl coreutils iproute2 \ + && echo "alias ls='ls --color=auto'" >> /root/.bashrc \ + && rm -rf /var/cache/apk/* +ENV PS1='\[\e[33;1;1m\][\[\e[0m\]\[\e[35;1m\]\u\[\e[0m\]\[\e[33;1;1m\]@\[\e[0m\]\[\e[31;1;1m\]docker\[\e[0m\]\[\e[32;1;1m\](\h)\[\e[0m\]\[\e[33;1;1m\]:\[\e[0m\]\[\e[32m\]\w\[\e[0m\]\[\e[33;1;1m\]]\[\e[0m\]\[\e[36m\]\$\[\e[0m\] ' +ENV PS2='\[\e[36m\]>\[\e[0m\] ' +ENV LANG=en_US.UTF-8 + diff --git a/nginx/Dockerfile-latest b/nginx/Dockerfile-latest index 99ddb53..22b386c 100644 --- a/nginx/Dockerfile-latest +++ b/nginx/Dockerfile-latest @@ -1,8 +1,9 @@ ARG ARCH -FROM harbor.colben.cn/general/alpine$ARCH:3.20 +FROM harbor.colben.cn/general/alpine$ARCH:3.23 MAINTAINER Colben colbenlee@gmail.com ADD --chown=root:root /ADD/ /opt/ -RUN apk update \ +RUN sed -i 's/v3.23/edge/' /etc/apk/repositories \ + && apk update \ && apk add --no-cache nginx nginx-mod-stream \ && sed -i \ -e '1a\\n# Added by Dockerfile' \ diff --git a/nginx/nginx.sh b/nginx/nginx.sh index d3a3837..cd9a8db 100755 --- a/nginx/nginx.sh +++ b/nginx/nginx.sh @@ -9,7 +9,7 @@ export LANG=en_US.UTF-8 [ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)" ROOT_DIR="$(cd $(dirname $0) && pwd)" -TAG=$1 +TAG=${1:-latest} IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:$TAG" if [ -t 0 ]; then diff --git a/redis/ADD/ccmd b/redis/ADD/ccmd index a84bd84..f409e51 100755 --- a/redis/ADD/ccmd +++ b/redis/ADD/ccmd @@ -58,6 +58,8 @@ function ModifyConf { protected-mode no maxmemory 6442450944 maxmemory-policy volatile-random +timeout 300 +maxclients 8192 " > /etc/redis.conf while read kv; do [ 'cluster-enabled=yes' == "$kv" ] && clusterEnabled=1 @@ -73,21 +75,20 @@ function DeployCluster { local i= local node= local nodesId= - local clusterEnabled= + local clusterInfo= local redisCliCmd="redis-cli ${REQUIREPASS:+-a $REQUIREPASS --no-auth-warning}" [ 0 -ne ${#SLAVE_NODES[@]} -a ${#SLAVE_NODES[@]} -ne ${#MASTER_NODES[@]} ] \ && Print The num of slave nodes not equal to the num of master nodes! \ && exit 100 + Print Checking the state of all nodes ... for node in ${MASTER_NODES[@]} ${SLAVE_NODES[@]}; do for i in {0..5}; do [ 5 -eq $i ] \ && Print Failed to connect to $node! \ && exit 100 - sleep 6 - clusterEnabled=$($redisCliCmd --raw -d , -h ${node/:/ -p } \ - CONFIG GET cluster-enabled) \ - || continue - [[ "$clusterEnabled" =~ ,yes$ ]] && break + sleep 2 + clusterInfo=$($redisCliCmd -h ${node/:/ -p } info cluster) || continue + echo "$clusterInfo" | grep -q cluster_enabled:1 && break Print $node not enable cluster mode! && exit 100 done done diff --git a/redis/Dockerfile-5 b/redis/Dockerfile-5 new file mode 100644 index 0000000..b2da23e --- /dev/null +++ b/redis/Dockerfile-5 @@ -0,0 +1,10 @@ +ARG ARCH +FROM harbor.colben.cn/general/alpine$ARCH:3.23 +MAINTAINER Colben colbenlee@gmail.com +ADD --chown=root:root /ADD/ /opt/ +RUN curl -sSLO https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.12/main/$(uname -m)/redis-5.0.14-r0.apk \ + && apk add --allow-untrusted redis-5.0.14-r0.apk \ + && mv /etc/redis.conf /etc/redis.conf.origin \ + && rm -rf /var/cache/apk/* redis-5.0.14-r0.apk +CMD ["/opt/ccmd"] + diff --git a/redis/Dockerfile b/redis/Dockerfile-6 similarity index 72% rename from redis/Dockerfile rename to redis/Dockerfile-6 index b9d4db9..8a050c0 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile-6 @@ -2,8 +2,7 @@ ARG ARCH FROM harbor.colben.cn/general/alpine$ARCH:3.20 MAINTAINER Colben colbenlee@gmail.com ADD --chown=root:root /ADD/ /opt/ -RUN apk update \ - && curl -sSLO https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.15/main/$(uname -m)/redis-6.2.18-r0.apk \ +RUN curl -sSLO https://mirrors.tuna.tsinghua.edu.cn/alpine/v3.15/main/$(uname -m)/redis-6.2.18-r0.apk \ && apk add --allow-untrusted redis-6.2.18-r0.apk \ && mv /etc/redis.conf /etc/redis.conf.origin \ && rm -rf /var/cache/apk/* redis-6.2.18-r0.apk diff --git a/redis/redis.sh b/redis/redis.sh index 7c036fd..d3a3837 100755 --- a/redis/redis.sh +++ b/redis/redis.sh @@ -9,7 +9,8 @@ export LANG=en_US.UTF-8 [ 'x86_64' == "$(uname -m)" ] && ARCH='' || ARCH="-$(uname -m)" ROOT_DIR="$(cd $(dirname $0) && pwd)" -IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:latest" +TAG=$1 +IMAGE="harbor.colben.cn/general/$(basename ${0%.sh})$ARCH:$TAG" if [ -t 0 ]; then function Print { echo -e "\033[36;1m$(date +'[%F %T]')\033[32;1m $*\033[0m"; } @@ -51,7 +52,7 @@ function Build { && Warn Removing image $IMAGE ... \ && docker rmi $IMAGE Warn Building image: $IMAGE ... - docker build --force-rm --build-arg ARCH="$ARCH" -t $IMAGE . + docker build --force-rm --build-arg ARCH="$ARCH" -t $IMAGE -f Dockerfile-$TAG . YesOrNo Push image: $IMAGE? && docker push $IMAGE }