diff --git a/.beagle/dockerfile b/.beagle/dockerfile index 0449641edc3c7cb432960ffd1727c538ccddaedb..5c8985ffa25e4051ec914462338e92f1f3622f15 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 e4b0b0a769db687a0cfa58d5a52c0c069ee06fb2..ab8c412d06ddcffc80dac1c8019eaa51607145a1 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 1eab05400a7d1fb58b9c30b8fe51713676cba9f5..4712533c054aa55d7004660a11341f3f5f02dc71 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