From 8f4947f7b581149d38d17df027fa35c944bc3d32 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 14:54:44 +0800
Subject: [PATCH] Update entrypoint.sh, rcache.conf, .beagle/dockerfile files

---
 .beagle/dockerfile | 3 ---
 entrypoint.sh      | 2 +-
 rcache.conf        | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.beagle/dockerfile b/.beagle/dockerfile
index 0449641..5c8985f 100644
--- a/.beagle/dockerfile
+++ b/.beagle/dockerfile
@@ -23,7 +23,6 @@ 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 sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories &&\
-    addgroup -S -g 1000 rcache && adduser -S -G rcache -u 1000 rcache && \
     apk add --no-cache bash
 
 COPY rcache.conf /etc/rcache/rcache.conf
@@ -34,7 +33,6 @@ COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh
 
 COPY healthcheck.sh /usr/bin/healthcheck.sh
 
-RUN chown -R rcache:rcache /etc/rcache
 
 VOLUME ["/data"]
 
@@ -42,6 +40,5 @@ WORKDIR /data
 
 EXPOSE 6379
 
-USER 1000
 
 ENTRYPOINT ["/usr/bin/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index e4b0b0a..ab8c412 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,7 +15,7 @@ apply_permissions() {
 common_operation() {
     mkdir -p "${DATA_DIR}"
     mkdir -p "/etc/rcache/external.conf.d"
-    touch -p "/etc/rcache/external.conf.d/rcache-additional.conf"
+    touch "/etc/rcache/external.conf.d/rcache-additional.conf"
 }
 
 set_rcache_password() {
diff --git a/rcache.conf b/rcache.conf
index 1eab054..4712533 100755
--- a/rcache.conf
+++ b/rcache.conf
@@ -4,4 +4,4 @@ timeout 0
 tcp-keepalive 300
 daemonize no
 supervised no
-pidfile /var/run/redis.pid
+pidfile /var/run/rcache.pid
-- 
2.26.0