Skip to content

Commit 1e3c60f

Browse files
tianontianon
authored
Merge pull request #216 from infosiftr/templates
Add initial templating
2 parents 21c19ef + d875ae0 commit 1e3c60f

File tree

8 files changed

+350
-25
lines changed

8 files changed

+350
-25
lines changed

‎4.0/32bit/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ RUN set -eux; \
3939
gosu --version; \
4040
gosu nobody true
4141

42-
ENV REDIS_VERSION 4.0.14
43-
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.14.tar.gz
44-
ENV REDIS_DOWNLOAD_SHA 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7
45-
4642
RUN set -eux; \
4743
apt-get update; \
4844
apt-get install -y --no-install-recommends libc6-i386; \
4945
rm -rf /var/lib/apt/lists/*
5046

47+
ENV REDIS_VERSION 4.0.14
48+
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-4.0.14.tar.gz
49+
ENV REDIS_DOWNLOAD_SHA 1e1e18420a86cfb285933123b04a82e1ebda20bfb0a289472745a087587e93a7
50+
5151
RUN set -eux; \
5252
\
5353
savedAptMark="$(apt-mark showmanual)"; \

‎5.0/32bit/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ RUN set -eux; \
3939
gosu --version; \
4040
gosu nobody true
4141

42-
ENV REDIS_VERSION 5.0.7
43-
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-5.0.7.tar.gz
44-
ENV REDIS_DOWNLOAD_SHA 61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b
45-
4642
RUN set -eux; \
4743
apt-get update; \
4844
apt-get install -y --no-install-recommends libc6-i386; \
4945
rm -rf /var/lib/apt/lists/*
5046

47+
ENV REDIS_VERSION 5.0.7
48+
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-5.0.7.tar.gz
49+
ENV REDIS_DOWNLOAD_SHA 61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b
50+
5151
RUN set -eux; \
5252
\
5353
savedAptMark="$(apt-mark showmanual)"; \

‎6.0-rc/32bit/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ RUN set -eux; \
3939
gosu --version; \
4040
gosu nobody true
4141

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-
4642
RUN set -eux; \
4743
apt-get update; \
4844
apt-get install -y --no-install-recommends libc6-i386; \
4945
rm -rf /var/lib/apt/lists/*
5046

47+
ENV REDIS_VERSION 6.0-rc1
48+
ENV REDIS_DOWNLOAD_URL https://github.com/antirez/redis/archive/6.0-rc1.tar.gz
49+
ENV REDIS_DOWNLOAD_SHA 2676012e2fcfe8d41e594b2ae8a05d0a050d2d84c38a0471ae5fe0143e4b0eca
50+
5151
RUN set -eux; \
5252
\
5353
savedAptMark="$(apt-mark showmanual)"; \

‎Dockerfile-32bit.template‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
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+
RUN set -eux; \
43+
apt-get update; \
44+
apt-get install -y --no-install-recommends libc6-i386; \
45+
rm -rf /var/lib/apt/lists/*
46+
47+
ENV REDIS_VERSION placeholder
48+
ENV REDIS_DOWNLOAD_URL placeholder
49+
ENV REDIS_DOWNLOAD_SHA placeholder
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+
##<protected-mode-sed>##
76+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
77+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
78+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
79+
##</protected-mode-sed>##
80+
# 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"
81+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
82+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
83+
\
84+
make -C /usr/src/redis -j "$(nproc)" 32bit; \
85+
make -C /usr/src/redis install; \
86+
\
87+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
88+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
89+
find /usr/local/bin/redis* -maxdepth 0 \
90+
-type f -not -name redis-server \
91+
-exec sh -eux -c ' \
92+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
93+
test "$md5" = "$serverMd5"; \
94+
' -- '{}' ';' \
95+
-exec ln -svfT 'redis-server' '{}' ';' \
96+
; \
97+
\
98+
rm -r /usr/src/redis; \
99+
\
100+
apt-mark auto '.*' > /dev/null; \
101+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
102+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
103+
\
104+
redis-cli --version; \
105+
redis-server --version
106+
107+
RUN mkdir /data && chown redis:redis /data
108+
VOLUME /data
109+
WORKDIR /data
110+
111+
COPY docker-entrypoint.sh /usr/local/bin/
112+
ENTRYPOINT ["docker-entrypoint.sh"]
113+
114+
EXPOSE 6379
115+
CMD ["redis-server"]

‎Dockerfile-alpine.template‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
FROM alpine:3.11
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 placeholder
14+
ENV REDIS_DOWNLOAD_URL placeholder
15+
ENV REDIS_DOWNLOAD_SHA placeholder
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+
##<protected-mode-sed>##
37+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
38+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
39+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
40+
##</protected-mode-sed>##
41+
# 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"
42+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
43+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
44+
\
45+
make -C /usr/src/redis -j "$(nproc)"; \
46+
make -C /usr/src/redis install; \
47+
\
48+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
49+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
50+
find /usr/local/bin/redis* -maxdepth 0 \
51+
-type f -not -name redis-server \
52+
-exec sh -eux -c ' \
53+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
54+
test "$md5" = "$serverMd5"; \
55+
' -- '{}' ';' \
56+
-exec ln -svfT 'redis-server' '{}' ';' \
57+
; \
58+
\
59+
rm -r /usr/src/redis; \
60+
\
61+
runDeps="$( \
62+
scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
63+
| tr ',' '\n' \
64+
| sort -u \
65+
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
66+
)"; \
67+
apk add --no-network --virtual .redis-rundeps $runDeps; \
68+
apk del --no-network .build-deps; \
69+
\
70+
redis-cli --version; \
71+
redis-server --version
72+
73+
RUN mkdir /data && chown redis:redis /data
74+
VOLUME /data
75+
WORKDIR /data
76+
77+
COPY docker-entrypoint.sh /usr/local/bin/
78+
ENTRYPOINT ["docker-entrypoint.sh"]
79+
80+
EXPOSE 6379
81+
CMD ["redis-server"]

‎Dockerfile.template‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
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 placeholder
43+
ENV REDIS_DOWNLOAD_URL placeholder
44+
ENV REDIS_DOWNLOAD_SHA placeholder
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+
##<protected-mode-sed>##
70+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' /usr/src/redis/src/config.c; \
71+
sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' /usr/src/redis/src/config.c; \
72+
grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' /usr/src/redis/src/config.c; \
73+
##</protected-mode-sed>##
74+
# 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"
75+
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
76+
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
77+
\
78+
make -C /usr/src/redis -j "$(nproc)"; \
79+
make -C /usr/src/redis install; \
80+
\
81+
# TODO https://github.com/antirez/redis/pull/3494 (deduplicate "redis-server" copies)
82+
serverMd5="$(md5sum /usr/local/bin/redis-server | cut -d' ' -f1)"; export serverMd5; \
83+
find /usr/local/bin/redis* -maxdepth 0 \
84+
-type f -not -name redis-server \
85+
-exec sh -eux -c ' \
86+
md5="$(md5sum "$1" | cut -d" " -f1)"; \
87+
test "$md5" = "$serverMd5"; \
88+
' -- '{}' ';' \
89+
-exec ln -svfT 'redis-server' '{}' ';' \
90+
; \
91+
\
92+
rm -r /usr/src/redis; \
93+
\
94+
apt-mark auto '.*' > /dev/null; \
95+
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
96+
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
97+
\
98+
redis-cli --version; \
99+
redis-server --version
100+
101+
RUN mkdir /data && chown redis:redis /data
102+
VOLUME /data
103+
WORKDIR /data
104+
105+
COPY docker-entrypoint.sh /usr/local/bin/
106+
ENTRYPOINT ["docker-entrypoint.sh"]
107+
108+
EXPOSE 6379
109+
CMD ["redis-server"]

‎old-protected-mode-sed.template‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# this changes in Redis 6.0+: https://github.com/docker-library/redis/pull/212#issuecomment-567705694 (see "update.sh" for where this template gets injected)
2+
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
3+
sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
4+
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \

0 commit comments

Comments
 (0)