From 4e774bd1daa02c298d74bbc43d34b48a7d02ca3d 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 10:39:31 +0800
Subject: [PATCH] Update .beagle/dockerfile

---
 .beagle/dockerfile | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/.beagle/dockerfile b/.beagle/dockerfile
index 13139d2..23bb38b 100644
--- a/.beagle/dockerfile
+++ b/.beagle/dockerfile
@@ -1,48 +1,47 @@
-ARG BASE
+FROM alpine:3.15 as builder
 
-FROM $BASE as builder
-
-MAINTAINER Beagle
+MAINTAINER Opstree Solutions
 
 LABEL VERSION=1.0 \
-      ARCH=AMD64 
+      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 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 https://dl.wodcloud.com/lyl/redis-stable.tar.gz && \
+RUN curl -fL -Lo /tmp/redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_VERSION}.tar.gz && \
     cd /tmp && \
     tar xvzf redis-${REDIS_VERSION}.tar.gz && \
     cd redis-${REDIS_VERSION} && \
     make && \
     make install BUILD_TLS=yes
 
-FROM $BASE
+FROM alpine:3.15
 
-MAINTAINER Beagle
+MAINTAINER Opstree Solutions
 
-LABEL VERSION=1.0 
+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/rcache-server /usr/local/bin/rcache-server
-COPY --from=builder /usr/local/bin/rcache-cli /usr/local/bin/rcache-cli
+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
 
-RUN addgroup -S -g 1000 rcache && adduser -S -G  rcache -u 1000  rcache && \
+RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 1000 redis && \
     apk add --no-cache bash
 
-COPY  rcache.conf /etc/rcache/rcache.conf
+COPY redis.conf /etc/redis/redis.conf
 
 COPY entrypoint.sh /usr/bin/entrypoint.sh
 
 COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh
 
-#COPY healthcheck.sh /usr/bin/healthcheck.sh
-
+COPY healthcheck.sh /usr/bin/healthcheck.sh
 
-RUN chown -R  rcache:rcache /etc/rcache
+RUN chown -R redis:redis /etc/redis
 
 VOLUME ["/data"]
 
@@ -52,4 +51,4 @@ EXPOSE 6379
 
 USER 1000
 
-ENTRYPOINT ["sh","/usr/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/bin/entrypoint.sh"]
-- 
2.26.0