From 5a26f562311a85a2a12fc726f664f77fe5d93919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=B0=B8=E4=BA=AE?= Date: Tue, 10 Jan 2023 09:29:09 +0800 Subject: [PATCH] Update .beagle.yml, .beagle/dockerfile, create-cluster.sh files --- .beagle.yml | 4 ++-- .beagle/dockerfile | 10 ++++------ create-cluster.sh | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 305cfeb..889e1d9 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -23,7 +23,7 @@ steps: path: /var/run/docker.sock settings: dockerfile: .beagle/dockerfile - base: registry.cn-qingdao.aliyuncs.com/wod/alpine:v3.17.0-amd64 + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/ubuntu:20.04-amd64 registry: registry.cn-qingdao.aliyuncs.com repo: wod/rcache tag: 7.0.7-amd64 @@ -41,7 +41,7 @@ steps: path: /var/run/docker.sock settings: dockerfile: .beagle/dockerfile - base: registry.cn-qingdao.aliyuncs.com/wod/alpine:v3.17.0-arm64 + base: registry.cn-qingdao.aliyuncs.com/wod-k8s/ubuntu:20.04-arm64 registry: registry.cn-qingdao.aliyuncs.com repo: wod/rcache tag: 7.0.7-arm64 diff --git a/.beagle/dockerfile b/.beagle/dockerfile index 3150f40..a7c7491 100644 --- a/.beagle/dockerfile +++ b/.beagle/dockerfile @@ -2,11 +2,10 @@ ARG BASE FROM $BASE as builder -MAINTAINER Opstree Solutions +MAINTAINER Beagle LABEL VERSION=1.0 \ - ARCH=AMD64 \ - DESCRIPTION="A production grade performance tuned redis docker image created by Opstree Solutions" + ARCH=AMD64 ARG REDIS_DOWNLOAD_URL="http://download.redis.io/" @@ -23,10 +22,9 @@ RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz https://dl.wodcloud.com/lyl/ FROM $BASE -MAINTAINER Opstree Solutions +MAINTAINER Beagle -LABEL VERSION=1.0 \ - DESCRIPTION="A production grade performance tuned redis docker image created by Opstree Solutions" +LABEL VERSION=1.0 COPY --from=builder /usr/local/bin/rcache-server /usr/local/bin/rcache-server COPY --from=builder /usr/local/bin/rcache-cli /usr/local/bin/rcache-cli diff --git a/create-cluster.sh b/create-cluster.sh index 65bdde9..b4267c3 100755 --- a/create-cluster.sh +++ b/create-cluster.sh @@ -2,4 +2,4 @@ PODS="$1" -yes yes | redis-cli --cluster create ${PODS} +yes yes | rcache-cli --cluster create ${PODS} -- 2.26.0