diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 4bd2dd876..10fc24920 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -114,18 +114,6 @@ RUN set -eux; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ - \ -# TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) - serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ - find /usr/local/bin/redis* -maxdepth 0 \ - -type f -not -name redis-server \ - -exec sh -eux -c ' \ - md5="$(md5sum "$1" | cut -d" " -f1)"; \ - test "$md5" = "$serverMd5"; \ - ' -- '{}' ';' \ - -exec ln -svfT 'redis-server' '{}' ';' \ - ; \ - \ make -C /usr/src/redis distclean; \ rm -r /usr/src/redis; \ \ diff --git a/alpine/Dockerfile.j2 b/alpine/Dockerfile.j2 index 72042a533..74e2575ce 100644 --- a/alpine/Dockerfile.j2 +++ b/alpine/Dockerfile.j2 @@ -148,18 +148,6 @@ RUN set -eux; \ fi; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ - \ -# TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) - serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ - find /usr/local/bin/redis* -maxdepth 0 \ - -type f -not -name redis-server \ - -exec sh -eux -c ' \ - md5="$(md5sum "$1" | cut -d" " -f1)"; \ - test "$md5" = "$serverMd5"; \ - ' -- '{}' ';' \ - -exec ln -svfT 'redis-server' '{}' ';' \ - ; \ - \ make -C /usr/src/redis distclean; \ rm -r /usr/src/redis; \ \ diff --git a/debian/Dockerfile b/debian/Dockerfile index 3ef651832..a2495cc19 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -89,18 +89,6 @@ RUN set -eux; \ export BUILD_TLS=yes; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ - \ -# TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) - serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ - find /usr/local/bin/redis* -maxdepth 0 \ - -type f -not -name redis-server \ - -exec sh -eux -c ' \ - md5="$(md5sum "$1" | cut -d" " -f1)"; \ - test "$md5" = "$serverMd5"; \ - ' -- '{}' ';' \ - -exec ln -svfT 'redis-server' '{}' ';' \ - ; \ - \ make -C /usr/src/redis distclean; \ rm -r /usr/src/redis; \ \ diff --git a/debian/Dockerfile.j2 b/debian/Dockerfile.j2 index c723857cf..8f46600ad 100644 --- a/debian/Dockerfile.j2 +++ b/debian/Dockerfile.j2 @@ -123,18 +123,6 @@ RUN set -eux; \ export BUILD_TLS=yes; \ make -C /usr/src/redis -j "$(nproc)" all; \ make -C /usr/src/redis install; \ - \ -# TODO https://github.com/redis/redis/pull/3494 (deduplicate "redis-server" copies) - serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \ - find /usr/local/bin/redis* -maxdepth 0 \ - -type f -not -name redis-server \ - -exec sh -eux -c ' \ - md5="$(md5sum "$1" | cut -d" " -f1)"; \ - test "$md5" = "$serverMd5"; \ - ' -- '{}' ';' \ - -exec ln -svfT 'redis-server' '{}' ';' \ - ; \ - \ make -C /usr/src/redis distclean; \ rm -r /usr/src/redis; \ \