From 6c299a6986fa7aabaf9683002dc6c528a6969dc3 Mon Sep 17 00:00:00 2001
From: adamiBs <adam.ben-shmuel@redis.com>
Date: Fri, 13 Sep 2024 11:58:07 +0300
Subject: [PATCH] Removal of multistage build

In order to avoid potential issues while Docker attempt to build our images. We will remove the multistage build from our Dockerfiles.
---
 alpine/Dockerfile | 21 +++++++++++----------
 debian/Dockerfile | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index 7ae463e8..74d07c4d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,12 +1,3 @@
-FROM alpine:3.20 AS sources
-ENV REDIS_VERSION=8.0-m01
-ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz
-ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c
-WORKDIR /files
-RUN apk add tar patch wget
-RUN wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; echo "$REDIS_DOWNLOAD_SHA redis.tar.gz" | sha256sum -c -;
-RUN tar -xvf redis.tar.gz && mv redis-$REDIS_VERSION redis
-
 FROM alpine:3.20
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
@@ -52,7 +43,11 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-RUN --mount=type=bind,from=sources,source=/files/redis,target=/usr/src/redis,rw set -eux; \
+ENV REDIS_VERSION=8.0-m01
+ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz
+ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c
+
+RUN set -eux; \
 	\
 	apk add --no-cache --virtual .build-deps \
 		coreutils \
@@ -90,6 +85,12 @@ RUN --mount=type=bind,from=sources,source=/files/redis,target=/usr/src/redis,rw
 			;\
 	fi; \
 	\
+	wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
+	echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
+	mkdir -p /usr/src/redis; \
+	tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
+	rm redis.tar.gz; \
+	\
 # disable Redis protected mode [1] as it is unnecessary in context of Docker
 # (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
 # [1]: https://github.com/redis/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 20c3d7d7..c51a537d 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -1,12 +1,3 @@
-FROM debian:bookworm-slim AS sources
-ENV REDIS_VERSION=8.0-m01
-ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz
-ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c
-WORKDIR /files
-RUN apt-get update && apt-get install -y tar patch wget
-RUN wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; echo "$REDIS_DOWNLOAD_SHA redis.tar.gz" | sha256sum -c -;
-RUN tar -xvf redis.tar.gz && mv redis-$REDIS_VERSION redis
-
 FROM debian:bookworm-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
@@ -59,7 +50,11 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-RUN --mount=type=bind,from=sources,source=/files/redis,target=/usr/src/redis,rw set -eux; \
+ENV REDIS_VERSION=8.0-m01
+ENV REDIS_DOWNLOAD_URL=https://github.com/redis/redis/archive/refs/tags/8.0-m01.tar.gz
+ENV REDIS_DOWNLOAD_SHA=4c77c2218747505c50c43a45d12a067a3631a26d9397929da180e183b03e862c
+
+RUN set -eux; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	apt-get update; \
@@ -98,6 +93,12 @@ RUN --mount=type=bind,from=sources,source=/files/redis,target=/usr/src/redis,rw
 	\
 	rm -rf /var/lib/apt/lists/*; \
 	\
+	wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
+	echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
+	mkdir -p /usr/src/redis; \
+	tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
+	rm redis.tar.gz; \
+	\
 # disable Redis protected mode [1] as it is unnecessary in context of Docker
 # (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
 # [1]: https://github.com/redis/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da