From da742ad8505c2cea5ea334922c9b3b1d10e716bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E6=B0=B8=E4=BA=AE?= <luoyongliang@wodcloud.com>
Date: Tue, 10 Jan 2023 11:37:07 +0800
Subject: [PATCH] Update .beagle/dockerfile, rcache.conf files

---
 .beagle/dockerfile        | 26 +++++++-------------------
 redis.conf => rcache.conf |  0
 2 files changed, 7 insertions(+), 19 deletions(-)
 rename redis.conf => rcache.conf (100%)

diff --git a/.beagle/dockerfile b/.beagle/dockerfile
index b7d2085..90c90cf 100644
--- a/.beagle/dockerfile
+++ b/.beagle/dockerfile
@@ -1,40 +1,28 @@
 FROM alpine:3.15 as builder
 
-MAINTAINER Opstree Solutions
-
-LABEL VERSION=1.0 \
-      ARCH=AMD64 \
-      DESCRIPTION="A production grade performance tuned redis docker image created by Opstree Solutions"
-
-ARG REDIS_DOWNLOAD_URL="http://download.redis.io/"
 
 ARG REDIS_VERSION="stable"
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories &&\
 apk add --no-cache su-exec tzdata make curl build-base linux-headers bash openssl-dev
 
-RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_VERSION}.tar.gz && \
+RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz https://dl.wodcloud.com/lyl/redis-stable.tar.gz && \
     cd /tmp && \
-    tar xvzf redis-${REDIS_VERSION}.tar.gz && \
+    tar xf redis-${REDIS_VERSION}.tar.gz && \
     cd redis-${REDIS_VERSION} && \
     make && \
     make install BUILD_TLS=yes
 
 FROM alpine:3.15
 
-MAINTAINER Opstree Solutions
-
-LABEL VERSION=1.0 \
-      ARCH=AMD64 \
-      DESCRIPTION="A production grade performance tuned redis docker image created by Opstree Solutions"
 
-COPY --from=builder /usr/local/bin/redis-server /usr/local/bin/redis-server
-COPY --from=builder /usr/local/bin/redis-cli /usr/local/bin/redis-cli
+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
 
-RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 1000 redis && \
+RUN addgroup -S -g 1000 rcache && adduser -S -G rcache -u 1000 rcache && \
     apk add --no-cache bash
 
-COPY redis.conf /etc/redis/redis.conf
+COPY rcache.conf /etc/redis/rcache.conf
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 
@@ -42,7 +30,7 @@ COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh
 
 COPY healthcheck.sh /usr/bin/healthcheck.sh
 
-RUN chown -R redis:redis /etc/redis
+RUN chown -R rcache:rcache /etc/rcache
 
 VOLUME ["/data"]
 
diff --git a/redis.conf b/rcache.conf
similarity index 100%
rename from redis.conf
rename to rcache.conf
-- 
2.26.0