Skip to content

Commit 24aa66d

Browse files
tianontianon
committed
Account for sha256 and update to 3.2.9
1 parent 6a2e3d0 commit 24aa66d

File tree

7 files changed

+26
-24
lines changed

7 files changed

+26
-24
lines changed

‎3.0/32bit/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN set -x \
2222

2323
ENV REDIS_VERSION 3.0.7
2424
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
25-
ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
25+
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
2626

2727
RUN apt-get update && apt-get install -y libc6-i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
2828

@@ -32,7 +32,7 @@ RUN buildDeps='gcc gcc-multilib libc6-dev-i386 make' \
3232
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
3333
&& rm -rf /var/lib/apt/lists/* \
3434
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
35-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
35+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
3636
&& mkdir -p /usr/src/redis \
3737
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
3838
&& rm redis.tar.gz \

‎3.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ RUN set -x \
2222

2323
ENV REDIS_VERSION 3.0.7
2424
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
25-
ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
25+
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
2626

2727
# for redis-sentinel see: http://redis.io/topics/sentinel
2828
RUN buildDeps='gcc libc6-dev make' \
2929
&& set -x \
3030
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
3131
&& rm -rf /var/lib/apt/lists/* \
3232
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
33-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
33+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
3434
&& mkdir -p /usr/src/redis \
3535
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
3636
&& rm redis.tar.gz \

‎3.0/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN apk add --no-cache 'su-exec>=0.2'
88

99
ENV REDIS_VERSION 3.0.7
1010
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
11-
ENV REDIS_DOWNLOAD_SHA1 e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
11+
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
1212

1313
# for redis-sentinel see: http://redis.io/topics/sentinel
1414
RUN set -x \
@@ -19,7 +19,7 @@ RUN set -x \
1919
musl-dev \
2020
tar \
2121
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
22-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
22+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
2323
&& mkdir -p /usr/src/redis \
2424
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
2525
&& rm redis.tar.gz \

‎3.2/32bit/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN set -x \
2020
&& chmod +x /usr/local/bin/gosu \
2121
&& gosu nobody true
2222

23-
ENV REDIS_VERSION 3.2.8
24-
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.8.tar.gz
25-
ENV REDIS_DOWNLOAD_SHA1 6780d1abb66f33a97aad0edbe020403d0a15b67f
23+
ENV REDIS_VERSION 3.2.9
24+
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
25+
ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
2626

2727
RUN apt-get update && apt-get install -y libc6-i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
2828

@@ -40,7 +40,7 @@ RUN set -ex \
4040
&& rm -rf /var/lib/apt/lists/* \
4141
\
4242
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
43-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
43+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c - \
4444
&& mkdir -p /usr/src/redis \
4545
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
4646
&& rm redis.tar.gz \

‎3.2/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ RUN set -x \
2020
&& chmod +x /usr/local/bin/gosu \
2121
&& gosu nobody true
2222

23-
ENV REDIS_VERSION 3.2.8
24-
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.8.tar.gz
25-
ENV REDIS_DOWNLOAD_SHA1 6780d1abb66f33a97aad0edbe020403d0a15b67f
23+
ENV REDIS_VERSION 3.2.9
24+
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
25+
ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
2626

2727
# for redis-sentinel see: http://redis.io/topics/sentinel
2828
RUN set -ex \
@@ -37,7 +37,7 @@ RUN set -ex \
3737
&& rm -rf /var/lib/apt/lists/* \
3838
\
3939
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
40-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
40+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c - \
4141
&& mkdir -p /usr/src/redis \
4242
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
4343
&& rm redis.tar.gz \

‎3.2/alpine/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ RUN addgroup -S redis && adduser -S -G redis redis
66
# grab su-exec for easy step-down from root
77
RUN apk add --no-cache 'su-exec>=0.2'
88

9-
ENV REDIS_VERSION 3.2.8
10-
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.8.tar.gz
11-
ENV REDIS_DOWNLOAD_SHA1 6780d1abb66f33a97aad0edbe020403d0a15b67f
9+
ENV REDIS_VERSION 3.2.9
10+
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
11+
ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
1212

1313
# for redis-sentinel see: http://redis.io/topics/sentinel
1414
RUN set -ex \
@@ -21,7 +21,7 @@ RUN set -ex \
2121
tar \
2222
\
2323
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
24-
&& echo "$REDIS_DOWNLOAD_SHA1 *redis.tar.gz" | sha1sum -c - \
24+
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c - \
2525
&& mkdir -p /usr/src/redis \
2626
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
2727
&& rm redis.tar.gz \

‎update.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@ for version in "${versions[@]}"; do
1919
fullVersion="$(echo "$line" | cut -d' ' -f2 | sed -r 's/^redis-|\.tar\..*$//g')"
2020
downloadUrl="$(echo "$line" | cut -d' ' -f5 | sed 's/[\/&]/\\&/g')"
2121
shaHash="$(echo "$line" | cut -d' ' -f4)"
22-
[ "$(echo "$line" | cut -d' ' -f3)" = 'sha1' ]
22+
shaType="$(echo "$line" | cut -d' ' -f3)"
23+
[ "$shaType" = 'sha256' ] || [ "$shaType" = 'sha1' ]
2324

2425
(
2526
set -x
26-
sed -ri '
27-
s/^(ENV REDIS_VERSION) .*/\1 '"$fullVersion"'/;
28-
s/^(ENV REDIS_DOWNLOAD_URL) .*/\1 '"$downloadUrl"'/;
29-
s/^(ENV REDIS_DOWNLOAD_SHA1) .*/\1 '"$shaHash"'/
30-
' "$version"/{,*/}Dockerfile
27+
sed -ri \
28+
-e 's/^(ENV REDIS_VERSION) .*/\1 '"$fullVersion"'/' \
29+
-e 's/^(ENV REDIS_DOWNLOAD_URL) .*/\1 '"$downloadUrl"'/' \
30+
-e 's/^(ENV REDIS_DOWNLOAD_SHA) .*/\1 '"$shaHash"'/' \
31+
-e 's!sha[0-9]+sum!'"$shaType"'sum!g' \
32+
"$version"/{,*/}Dockerfile
3133
)
3234
for variant in alpine 32bit; do
3335
[ -d "$version/$variant" ] || continue

0 commit comments

Comments
 (0)