Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…rator into extra_image

# Conflicts:
#	.github/workflows/release.yml
  • Loading branch information
guozhi.li committed Dec 7, 2022
2 parents d83157f + 4b1c59d commit c6333c8
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
4 changes: 4 additions & 0 deletions arm64/images/ot-redis/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ COPY healthcheck.sh /usr/bin/healthcheck.sh

RUN mkdir -p /opt/redis/ && chmod -R g+rwX /etc/redis /opt/redis

RUN chmod +x /usr/bin/entrypoint.sh
RUN chmod +x /usr/bin/setupMasterSlave.sh
RUN chmod +x /usr/bin/healthcheck.sh

VOLUME ["/data"]

WORKDIR /data
Expand Down
34 changes: 34 additions & 0 deletions arm64/images/ot-redis/Dockerfile-bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM --platform=$TARGETPLATFORM docker.m.daocloud.io/redis:6.2.5-alpine


#https://github.com/redis/redis/archive/refs/tags/6.2.5.tar.gz

#RUN addgroup -S -g 1001 redis \
# && adduser -S -G redis -u 1001 redis \
# && apk add --no-cache su-exec tzdata make curl build-base linux-headers bash

RUN apk add --no-cache su-exec tzdata make curl build-base linux-headers bash

RUN mkdir -p /etc/redis

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

RUN mkdir -p /opt/redis/ && chmod -R g+rwX /etc/redis /opt/redis

RUN chmod +x /usr/bin/entrypoint.sh
RUN chmod +x /usr/bin/setupMasterSlave.sh
RUN chmod +x /usr/bin/healthcheck.sh

VOLUME ["/data"]

WORKDIR /data

EXPOSE 6379 6379

ENTRYPOINT ["/usr/bin/entrypoint.sh"]
4 changes: 2 additions & 2 deletions arm64/images/ot-redis/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ external_config() {
start_redis() {
if [[ "${SETUP_MODE}" == "cluster" ]]; then
echo "Starting redis service in cluster mode....."
redis-server /etc/redis/redis.conf --cluster-announce-ip "${POD_IP}"
redis-server /etc/redis/redis.conf --cluster-announce-ip "${POD_IP}" "--ignore-warnings" "ARM64-COW-BUG"
else
echo "Starting redis service in standalone mode....."
redis-server /etc/redis/redis.conf
redis-server /etc/redis/redis.conf "--ignore-warnings" "ARM64-COW-BUG"
fi
}

Expand Down

0 comments on commit c6333c8

Please sign in to comment.