From 27778e8b05fbb057da23410466239a989b787526 Mon Sep 17 00:00:00 2001
From: drivebyer <wuyangmuc@gmail.com>
Date: Fri, 13 Sep 2024 22:41:31 +0800
Subject: [PATCH] Update cd.yaml

Signed-off-by: drivebyer <wuyangmuc@gmail.com>
---
 Dockerfile          |  6 +++---
 Dockerfile.sentinel | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb5eb42..4cfbada 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,10 @@ WORKDIR /tmp
 
 RUN REDIS_VERSION=$(echo ${REDIS_VERSION} | sed 's/^v//'); \
     case "${REDIS_VERSION}" in \
-       latest | stable) REDIS_DOWNLOAD_URL="http://download.redis.io";; \
-       *) REDIS_DOWNLOAD_URL="http://download.redis.io/releases";; \
+       latest | stable) REDIS_DOWNLOAD_URL="http://download.redis.io/redis-stable.tar.gz";; \
+       *) REDIS_DOWNLOAD_URL="http://download.redis.io/releases/redis-${REDIS_VERSION}.tar.gz";; \
     esac; \
-    curl -fL -Lo redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_VERSION}.tar.gz; \
+    curl -fL -Lo redis-${REDIS_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}; \
     tar xvzf redis-${REDIS_VERSION}.tar.gz
 
 WORKDIR /tmp/redis-${REDIS_VERSION}
diff --git a/Dockerfile.sentinel b/Dockerfile.sentinel
index a2e427c..4967724 100644
--- a/Dockerfile.sentinel
+++ b/Dockerfile.sentinel
@@ -14,14 +14,14 @@ WORKDIR /tmp
 
 RUN REDIS_SENTINEL_VERSION=$(echo ${REDIS_SENTINEL_VERSION} | sed 's/^v//'); \
     case "${REDIS_SENTINEL_VERSION}" in \
-       latest | stable) REDIS_DOWNLOAD_URL="http://download.redis.io";; \
-       *) REDIS_DOWNLOAD_URL="http://download.redis.io/releases";; \
+       latest | stable) REDIS_DOWNLOAD_URL="http://download.redis.io/redis-stable.tar.gz";; \
+       *) REDIS_DOWNLOAD_URL="http://download.redis.io/releases/redis-${REDIS_SENTINEL_VERSION}.tar.gz";; \
     esac; \
     \
-    curl -fL -Lo redis-${REDIS_SENTINEL_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}/redis-${REDIS_SENTINEL_VERSION}.tar.gz; \
+    curl -fL -Lo redis-${REDIS_SENTINEL_VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}; \
     tar xvzf redis-${REDIS_SENTINEL_VERSION}.tar.gz
 
-WORKDIR /tmp/redis-${REDIS_SENTINEL_VERSION}
+WORKDIR /tmp
 
 RUN arch="$(uname -m)"; \
     extraJemallocConfigureFlags="--with-lg-page=16"; \
@@ -29,8 +29,8 @@ RUN arch="$(uname -m)"; \
       sed -ri 's!cd jemalloc && ./configure !&'"$extraJemallocConfigureFlags"' !' /tmp/redis-${REDIS_SENTINEL_VERSION}/deps/Makefile; \
     fi; \
     export BUILD_TLS=yes; \
-    make all; \
-    make install
+    make -C redis-${REDIS_SENTINEL_VERSION} all; \
+    make -C redis-${REDIS_SENTINEL_VERSION} install
 
 FROM alpine:3.15