Skip to content

Commit da963e0

Browse files
yosifkityosifkit
authored
Merge pull request #212 from infosiftr/6.0
Add 6.0-rc1
2 parents d42494a + d122863 commit da963e0

File tree

8 files changed

+351
-0
lines changed

8 files changed

+351
-0
lines changed

‎.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ language: bash
22
services: docker
33

44
env:
5+
- VERSION=6.0-rc VARIANT=
6+
- VERSION=6.0-rc VARIANT=32bit
7+
- VERSION=6.0-rc VARIANT=alpine
58
- VERSION=5.0 VARIANT=
69
- VERSION=5.0 VARIANT=32bit
710
- VERSION=5.0 VARIANT=alpine

‎6.0-rc/32bit/Dockerfile

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
FROM debian:buster-slim
2+
3+
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
4+
RUN groupadd -r -g 999 redis && useradd -r -g redis -u 999 redis
5+
6+
# grab gosu for easy step-down from root
7+
# https://github.com/tianon/gosu/releases
8+
ENV GOSU_VERSION 1.11
9+
RUN set -eux; \
10+
# save list of currently installed packages for later so we can clean up
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends \
14+
ca-certificates \
15+
dirmngr \
16+
gnupg \
17+
wget \
18+
; \
19+
rm -rf /var/lib/apt/lists/*; \
20+
\
21+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
22+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
23+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
24+
\
25+
# verify the signature
26+
export GNUPGHOME="$(mktemp -d)"; \
27+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
28+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
29+
gpgconf --kill all; \
30+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
31+
\
32+
# clean up fetch dependencies
33+
apt-mark auto '.*' > /dev/null; \
34+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
35+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
36+
\
37+
chmod +x /usr/local/bin/gosu; \
38+
# verify that the binary works
39+
gosu --version; \
40+
gosu nobody true
41+
42+
ENV REDIS_VERSION 6.0-rc1
43+
ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
44+
ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
45+
46+
RUN set -eux; \
47+
apt-get update; \
48+
apt-get install -y --no-install-recommends libc6-i386; \
49+
rm -rf /var/lib/apt/lists/*
50+
51+
RUN set -eux; \
52+
\
53+
savedAptMark="$(apt-mark showmanual)"; \
54+
apt-get update; \
55+
apt-get install -y --no-install-recommends \
56+
ca-certificates \
57+
wget \
58+
\
59+
gcc \
60+
gcc-multilib \
61+
libc6-dev-i386 \
62+
make \
63+
; \
64+
rm -rf /var/lib/apt/lists/*; \
65+
\
66+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
67+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
68+
mkdir -p /usr/src/redis; \
69+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
70+
rm redis.tar.gz; \
71+
\
72+
# disable Redis protected mode [1] as it is unnecessary in context of Docker
73+
# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
74+
# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
75+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
76+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
77+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
78+
# for future reference, we modify this directly in the source instead of just supplying a default configuration flag because apparently "if you specify any argument to redis-server, [it assumes] you are going to specify everything"
79+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
80+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
81+
\
82+
make -C /usr/src/redis -j "$(nproc)" 32bit; \
83+
make -C /usr/src/redis install; \
84+
\
85+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
86+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
87+
find /usr/local/bin/redis* -maxdepth 0 \
88+
-type f -not -name redis-server \
89+
-exec sh -eux -c ' \
90+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
91+
test "$md5" = "$serverMd5"; \
92+
' -- '{}' ';' \
93+
-exec ln -svfT 'redis-server' '{}' ';' \
94+
; \
95+
\
96+
rm -r /usr/src/redis; \
97+
\
98+
apt-mark auto '.*' > /dev/null; \
99+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
100+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
101+
\
102+
redis-cli --version; \
103+
redis-server --version
104+
105+
RUN mkdir /data && chown redis:redis /data
106+
VOLUME /data
107+
WORKDIR /data
108+
109+
COPY docker-entrypoint.sh /usr/local/bin/
110+
ENTRYPOINT ["docker-entrypoint.sh"]
111+
112+
EXPOSE 6379
113+
CMD ["redis-server"]

‎6.0-rc/32bit/docker-entrypoint.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
# or first arg is `something.conf`
6+
if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
7+
set -- redis-server "$@"
8+
fi
9+
10+
# allow the container to be started with `--user`
11+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
12+
find . \! -user redis -exec chown redis '{}' +
13+
exec gosu redis "$0" "$@"
14+
fi
15+
16+
exec "$@"

‎6.0-rc/Dockerfile

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
FROM debian:buster-slim
2+
3+
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
4+
RUN groupadd -r -g 999 redis && useradd -r -g redis -u 999 redis
5+
6+
# grab gosu for easy step-down from root
7+
# https://github.com/tianon/gosu/releases
8+
ENV GOSU_VERSION 1.11
9+
RUN set -eux; \
10+
# save list of currently installed packages for later so we can clean up
11+
savedAptMark="$(apt-mark showmanual)"; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends \
14+
ca-certificates \
15+
dirmngr \
16+
gnupg \
17+
wget \
18+
; \
19+
rm -rf /var/lib/apt/lists/*; \
20+
\
21+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
22+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
23+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
24+
\
25+
# verify the signature
26+
export GNUPGHOME="$(mktemp -d)"; \
27+
gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
28+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
29+
gpgconf --kill all; \
30+
rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
31+
\
32+
# clean up fetch dependencies
33+
apt-mark auto '.*' > /dev/null; \
34+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
35+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
36+
\
37+
chmod +x /usr/local/bin/gosu; \
38+
# verify that the binary works
39+
gosu --version; \
40+
gosu nobody true
41+
42+
ENV REDIS_VERSION 6.0-rc1
43+
ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
44+
ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
45+
46+
RUN set -eux; \
47+
\
48+
savedAptMark="$(apt-mark showmanual)"; \
49+
apt-get update; \
50+
apt-get install -y --no-install-recommends \
51+
ca-certificates \
52+
wget \
53+
\
54+
gcc \
55+
libc6-dev \
56+
make \
57+
; \
58+
rm -rf /var/lib/apt/lists/*; \
59+
\
60+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
61+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
62+
mkdir -p /usr/src/redis; \
63+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
64+
rm redis.tar.gz; \
65+
\
66+
# disable Redis protected mode [1] as it is unnecessary in context of Docker
67+
# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
68+
# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
69+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
70+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
71+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
72+
# for future reference, we modify this directly in the source instead of just supplying a default configuration flag because apparently "if you specify any argument to redis-server, [it assumes] you are going to specify everything"
73+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
74+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
75+
\
76+
make -C /usr/src/redis -j "$(nproc)"; \
77+
make -C /usr/src/redis install; \
78+
\
79+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
80+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
81+
find /usr/local/bin/redis* -maxdepth 0 \
82+
-type f -not -name redis-server \
83+
-exec sh -eux -c ' \
84+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
85+
test "$md5" = "$serverMd5"; \
86+
' -- '{}' ';' \
87+
-exec ln -svfT 'redis-server' '{}' ';' \
88+
; \
89+
\
90+
rm -r /usr/src/redis; \
91+
\
92+
apt-mark auto '.*' > /dev/null; \
93+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
94+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
95+
\
96+
redis-cli --version; \
97+
redis-server --version
98+
99+
RUN mkdir /data && chown redis:redis /data
100+
VOLUME /data
101+
WORKDIR /data
102+
103+
COPY docker-entrypoint.sh /usr/local/bin/
104+
ENTRYPOINT ["docker-entrypoint.sh"]
105+
106+
EXPOSE 6379
107+
CMD ["redis-server"]

‎6.0-rc/alpine/Dockerfile

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
FROM alpine:3.10
2+
3+
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
4+
RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 999 redis
5+
# alpine already has a gid 999, so we'll use the next id
6+
7+
RUN apk add --no-cache \
8+
# grab su-exec for easy step-down from root
9+
'su-exec>=0.2' \
10+
# add tzdata for https://github.com/docker-library/redis/issues/138
11+
tzdata
12+
13+
ENV REDIS_VERSION 6.0-rc1
14+
ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
15+
ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
16+
17+
RUN set -eux; \
18+
\
19+
apk add --no-cache --virtual .build-deps \
20+
coreutils \
21+
gcc \
22+
linux-headers \
23+
make \
24+
musl-dev \
25+
; \
26+
\
27+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
28+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
29+
mkdir -p /usr/src/redis; \
30+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
31+
rm redis.tar.gz; \
32+
\
33+
# disable Redis protected mode [1] as it is unnecessary in context of Docker
34+
# (ports are not automatically exposed when running inside Docker, but rather explicitly by specifying -p / -P)
35+
# [1]: https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
36+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
37+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
38+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
39+
# for future reference, we modify this directly in the source instead of just supplying a default configuration flag because apparently "if you specify any argument to redis-server, [it assumes] you are going to specify everything"
40+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
41+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
42+
\
43+
make -C /usr/src/redis -j "$(nproc)"; \
44+
make -C /usr/src/redis install; \
45+
\
46+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
47+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
48+
find /usr/local/bin/redis* -maxdepth 0 \
49+
-type f -not -name redis-server \
50+
-exec sh -eux -c ' \
51+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
52+
test "$md5" = "$serverMd5"; \
53+
' -- '{}' ';' \
54+
-exec ln -svfT 'redis-server' '{}' ';' \
55+
; \
56+
\
57+
rm -r /usr/src/redis; \
58+
\
59+
runDeps="$( \
60+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
61+
| tr ',' '\n' \
62+
| sort -u \
63+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
64+
)"; \
65+
apk add --no-network --virtual .redis-rundeps $runDeps; \
66+
apk del --no-network .build-deps; \
67+
\
68+
redis-cli --version; \
69+
redis-server --version
70+
71+
RUN mkdir /data && chown redis:redis /data
72+
VOLUME /data
73+
WORKDIR /data
74+
75+
COPY docker-entrypoint.sh /usr/local/bin/
76+
ENTRYPOINT ["docker-entrypoint.sh"]
77+
78+
EXPOSE 6379
79+
CMD ["redis-server"]

‎6.0-rc/alpine/docker-entrypoint.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
# or first arg is `something.conf`
6+
if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
7+
set -- redis-server "$@"
8+
fi
9+
10+
# allow the container to be started with `--user`
11+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
12+
find . \! -user redis -exec chown redis '{}' +
13+
exec su-exec redis "$0" "$@"
14+
fi
15+
16+
exec "$@"

‎6.0-rc/docker-entrypoint.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/bin/sh
2+
set -e
3+
4+
# first arg is `-f` or `--some-option`
5+
# or first arg is `something.conf`
6+
if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
7+
set -- redis-server "$@"
8+
fi
9+
10+
# allow the container to be started with `--user`
11+
if [ "$1" = 'redis-server' -a "$(id -u)" = '0' ]; then
12+
find . \! -user redis -exec chown redis '{}' +
13+
exec gosu redis "$0" "$@"
14+
fi
15+
16+
exec "$@"

‎generate-stackbrew-library.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -eu
33

44
declare -A aliases=(
5+
[6.0-rc]='rc'
56
[5.0]='5 latest'
67
[4.0]='4'
78
)

0 commit comments

Comments
 (0)