Skip to content

Commit d7beb0c

Browse files
committed
Update cd.yaml
Signed-off-by: drivebyer <wuyangmuc@gmail.com>
1 parent 7b5256f commit d7beb0c

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

Dockerfile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@ RUN VERSION=$(echo ${REDIS_VERSION} | sed -e "s/^v//g"); \
2020
*) REDIS_DOWNLOAD_URL="http://download.redis.io/releases/redis-${VERSION}.tar.gz";; \
2121
esac; \
2222
curl -fL -Lo redis-${VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}; \
23-
tar xvzf redis-${VERSION}.tar.gz
24-
25-
WORKDIR /tmp/redis-${VERSION}
26-
27-
RUN arch="$(uname -m)"; \
23+
tar xvzf redis-${VERSION}.tar.gz; \
24+
\
25+
arch="$(uname -m)"; \
2826
extraJemallocConfigureFlags="--with-lg-page=16"; \
2927
if [ "$arch" = "aarch64" ] || [ "$arch" = "arm64" ]; then \
3028
sed -ri 's!cd jemalloc && ./configure !&'"$extraJemallocConfigureFlags"' !' /tmp/redis-${VERSION}/deps/Makefile; \
3129
fi; \
3230
export BUILD_TLS=yes; \
33-
make all; \
34-
make install
31+
make -C redis-${VERSION} all; \
32+
make -C redis-${VERSION} install
3533

3634
FROM alpine:3.15
3735

Dockerfile.sentinel

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ RUN VERSION=$(echo ${REDIS_SENTINEL_VERSION} | sed -e "s/^v//g"); \
1919
esac; \
2020
\
2121
curl -fL -Lo redis-${VERSION}.tar.gz ${REDIS_DOWNLOAD_URL}; \
22-
tar xvzf redis-${VERSION}.tar.gz
23-
24-
WORKDIR /tmp
25-
26-
RUN arch="$(uname -m)"; \
22+
tar xvzf redis-${VERSION}.tar.gz; \
23+
\
24+
arch="$(uname -m)"; \
2725
extraJemallocConfigureFlags="--with-lg-page=16"; \
2826
if [ "$arch" = "aarch64" ] || [ "$arch" = "arm64" ]; then \
2927
sed -ri 's!cd jemalloc && ./configure !&'"$extraJemallocConfigureFlags"' !' /tmp/redis-${VERSION}/deps/Makefile; \

0 commit comments

Comments
 (0)