Commit 8f4947f7 authored by 罗永亮's avatar 罗永亮

Update entrypoint.sh, rcache.conf, .beagle/dockerfile files

parent 75c7ae8a
Pipeline #91754 canceled with stage
...@@ -23,7 +23,6 @@ COPY --from=builder /usr/local/bin/rcache-server /usr/local/bin/rcache-server ...@@ -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 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 &&\ 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 apk add --no-cache bash
COPY rcache.conf /etc/rcache/rcache.conf COPY rcache.conf /etc/rcache/rcache.conf
...@@ -34,7 +33,6 @@ COPY setupMasterSlave.sh /usr/bin/setupMasterSlave.sh ...@@ -34,7 +33,6 @@ 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
VOLUME ["/data"] VOLUME ["/data"]
...@@ -42,6 +40,5 @@ WORKDIR /data ...@@ -42,6 +40,5 @@ WORKDIR /data
EXPOSE 6379 EXPOSE 6379
USER 1000
ENTRYPOINT ["/usr/bin/entrypoint.sh"] ENTRYPOINT ["/usr/bin/entrypoint.sh"]
...@@ -15,7 +15,7 @@ apply_permissions() { ...@@ -15,7 +15,7 @@ apply_permissions() {
common_operation() { common_operation() {
mkdir -p "${DATA_DIR}" mkdir -p "${DATA_DIR}"
mkdir -p "/etc/rcache/external.conf.d" 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() { set_rcache_password() {
......
...@@ -4,4 +4,4 @@ timeout 0 ...@@ -4,4 +4,4 @@ timeout 0
tcp-keepalive 300 tcp-keepalive 300
daemonize no daemonize no
supervised no supervised no
pidfile /var/run/redis.pid pidfile /var/run/rcache.pid
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment