Skip to content

Commit 4d181db

Browse files
yosifkityosifkit
authored
Merge pull request #94 from infosiftr/slim
Reduce Debian image size by roughly half and update to Alpine 3.6
2 parents 24aa66d + fa0e115 commit 4d181db

File tree

6 files changed

+223
-163
lines changed

6 files changed

+223
-163
lines changed

‎3.0/32bit/Dockerfile

Lines changed: 51 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,65 @@
1-
FROM debian:jessie
1+
FROM debian:jessie-slim
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
RUN groupadd -r redis && useradd -r -g redis redis
55

6-
RUN apt-get update && apt-get install -y --no-install-recommends \
7-
ca-certificates \
8-
wget \
9-
&& rm -rf /var/lib/apt/lists/*
10-
116
# grab gosu for easy step-down from root
12-
ENV GOSU_VERSION 1.7
13-
RUN set -x \
14-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
15-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
16-
&& export GNUPGHOME="$(mktemp -d)" \
17-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
18-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
19-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
20-
&& chmod +x /usr/local/bin/gosu \
21-
&& gosu nobody true
7+
# https://github.com/tianon/gosu/releases
8+
ENV GOSU_VERSION 1.10
9+
RUN set -ex; \
10+
\
11+
fetchDeps='ca-certificates wget'; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
rm -rf /var/lib/apt/lists/*; \
15+
\
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
23+
chmod +x /usr/local/bin/gosu; \
24+
gosu nobody true; \
25+
\
26+
apt-get purge -y --auto-remove $fetchDeps
2227

2328
ENV REDIS_VERSION 3.0.7
2429
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
2530
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
2631

27-
RUN apt-get update && apt-get install -y libc6-i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
32+
RUN apt-get update && apt-get install -y --no-install-recommends \
33+
libc6-i386 \
34+
&& rm -rf /var/lib/apt/lists/*
2835

2936
# for redis-sentinel see: http://redis.io/topics/sentinel
30-
RUN buildDeps='gcc gcc-multilib libc6-dev-i386 make' \
31-
&& set -x \
32-
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
33-
&& rm -rf /var/lib/apt/lists/* \
34-
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
35-
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
36-
&& mkdir -p /usr/src/redis \
37-
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
38-
&& rm redis.tar.gz \
39-
&& make -C /usr/src/redis 32bit \
40-
&& make -C /usr/src/redis install \
41-
&& rm -r /usr/src/redis \
42-
&& apt-get purge -y --auto-remove $buildDeps
37+
RUN set -ex; \
38+
\
39+
buildDeps=' \
40+
wget \
41+
\
42+
gcc \
43+
gcc-multilib \
44+
libc6-dev-i386 \
45+
make \
46+
'; \
47+
apt-get update; \
48+
apt-get install -y $buildDeps --no-install-recommends; \
49+
rm -rf /var/lib/apt/lists/*; \
50+
\
51+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
52+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c -; \
53+
mkdir -p /usr/src/redis; \
54+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
55+
rm redis.tar.gz; \
56+
\
57+
make -C /usr/src/redis -j "$(nproc)" 32bit; \
58+
make -C /usr/src/redis install; \
59+
\
60+
rm -r /usr/src/redis; \
61+
\
62+
apt-get purge -y --auto-remove $buildDeps
4363

4464
RUN mkdir /data && chown redis:redis /data
4565
VOLUME /data
@@ -50,4 +70,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
5070
ENTRYPOINT ["docker-entrypoint.sh"]
5171

5272
EXPOSE 6379
53-
CMD [ "redis-server" ]
73+
CMD ["redis-server"]

‎3.0/Dockerfile

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,60 @@
1-
FROM debian:jessie
1+
FROM debian:jessie-slim
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
RUN groupadd -r redis && useradd -r -g redis redis
55

6-
RUN apt-get update && apt-get install -y --no-install-recommends \
7-
ca-certificates \
8-
wget \
9-
&& rm -rf /var/lib/apt/lists/*
10-
116
# grab gosu for easy step-down from root
12-
ENV GOSU_VERSION 1.7
13-
RUN set -x \
14-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
15-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
16-
&& export GNUPGHOME="$(mktemp -d)" \
17-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
18-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
19-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
20-
&& chmod +x /usr/local/bin/gosu \
21-
&& gosu nobody true
7+
# https://github.com/tianon/gosu/releases
8+
ENV GOSU_VERSION 1.10
9+
RUN set -ex; \
10+
\
11+
fetchDeps='ca-certificates wget'; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
rm -rf /var/lib/apt/lists/*; \
15+
\
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
23+
chmod +x /usr/local/bin/gosu; \
24+
gosu nobody true; \
25+
\
26+
apt-get purge -y --auto-remove $fetchDeps
2227

2328
ENV REDIS_VERSION 3.0.7
2429
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
2530
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
2631

2732
# for redis-sentinel see: http://redis.io/topics/sentinel
28-
RUN buildDeps='gcc libc6-dev make' \
29-
&& set -x \
30-
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \
31-
&& rm -rf /var/lib/apt/lists/* \
32-
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
33-
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
34-
&& mkdir -p /usr/src/redis \
35-
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
36-
&& rm redis.tar.gz \
37-
&& make -C /usr/src/redis \
38-
&& make -C /usr/src/redis install \
39-
&& rm -r /usr/src/redis \
40-
&& apt-get purge -y --auto-remove $buildDeps
33+
RUN set -ex; \
34+
\
35+
buildDeps=' \
36+
wget \
37+
\
38+
gcc \
39+
libc6-dev \
40+
make \
41+
'; \
42+
apt-get update; \
43+
apt-get install -y $buildDeps --no-install-recommends; \
44+
rm -rf /var/lib/apt/lists/*; \
45+
\
46+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
47+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c -; \
48+
mkdir -p /usr/src/redis; \
49+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
50+
rm redis.tar.gz; \
51+
\
52+
make -C /usr/src/redis -j "$(nproc)"; \
53+
make -C /usr/src/redis install; \
54+
\
55+
rm -r /usr/src/redis; \
56+
\
57+
apt-get purge -y --auto-remove $buildDeps
4158

4259
RUN mkdir /data && chown redis:redis /data
4360
VOLUME /data
@@ -48,4 +65,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
4865
ENTRYPOINT ["docker-entrypoint.sh"]
4966

5067
EXPOSE 6379
51-
CMD [ "redis-server" ]
68+
CMD ["redis-server"]

‎3.0/alpine/Dockerfile

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.5
1+
FROM alpine:3.6
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
RUN addgroup -S redis && adduser -S -G redis redis
@@ -11,22 +11,28 @@ ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.0.7.tar.gz
1111
ENV REDIS_DOWNLOAD_SHA e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c
1212

1313
# for redis-sentinel see: http://redis.io/topics/sentinel
14-
RUN set -x \
15-
&& apk add --no-cache --virtual .build-deps \
14+
RUN set -ex; \
15+
\
16+
apk add --no-cache --virtual .build-deps \
17+
coreutils \
1618
gcc \
1719
linux-headers \
1820
make \
1921
musl-dev \
20-
tar \
21-
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
22-
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c - \
23-
&& mkdir -p /usr/src/redis \
24-
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
25-
&& rm redis.tar.gz \
26-
&& make -C /usr/src/redis \
27-
&& make -C /usr/src/redis install \
28-
&& rm -r /usr/src/redis \
29-
&& apk del .build-deps
22+
; \
23+
\
24+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
25+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha1sum -c -; \
26+
mkdir -p /usr/src/redis; \
27+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
28+
rm redis.tar.gz; \
29+
\
30+
make -C /usr/src/redis -j "$(nproc)"; \
31+
make -C /usr/src/redis install; \
32+
\
33+
rm -r /usr/src/redis; \
34+
\
35+
apk del .build-deps
3036

3137
RUN mkdir /data && chown redis:redis /data
3238
VOLUME /data
@@ -37,4 +43,4 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
3743
ENTRYPOINT ["docker-entrypoint.sh"]
3844

3945
EXPOSE 6379
40-
CMD [ "redis-server" ]
46+
CMD ["redis-server"]

‎3.2/32bit/Dockerfile

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,76 @@
1-
FROM debian:jessie
1+
FROM debian:jessie-slim
22

33
# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
44
RUN groupadd -r redis && useradd -r -g redis redis
55

6-
RUN apt-get update && apt-get install -y --no-install-recommends \
7-
ca-certificates \
8-
wget \
9-
&& rm -rf /var/lib/apt/lists/*
10-
116
# grab gosu for easy step-down from root
12-
ENV GOSU_VERSION 1.7
13-
RUN set -x \
14-
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
15-
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
16-
&& export GNUPGHOME="$(mktemp -d)" \
17-
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
18-
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
19-
&& rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \
20-
&& chmod +x /usr/local/bin/gosu \
21-
&& gosu nobody true
7+
# https://github.com/tianon/gosu/releases
8+
ENV GOSU_VERSION 1.10
9+
RUN set -ex; \
10+
\
11+
fetchDeps='ca-certificates wget'; \
12+
apt-get update; \
13+
apt-get install -y --no-install-recommends $fetchDeps; \
14+
rm -rf /var/lib/apt/lists/*; \
15+
\
16+
dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
17+
wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
18+
wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
19+
export GNUPGHOME="$(mktemp -d)"; \
20+
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
21+
gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
22+
rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc; \
23+
chmod +x /usr/local/bin/gosu; \
24+
gosu nobody true; \
25+
\
26+
apt-get purge -y --auto-remove $fetchDeps
2227

2328
ENV REDIS_VERSION 3.2.9
2429
ENV REDIS_DOWNLOAD_URL http://download.redis.io/releases/redis-3.2.9.tar.gz
2530
ENV REDIS_DOWNLOAD_SHA 6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26
2631

27-
RUN apt-get update && apt-get install -y libc6-i386 --no-install-recommends && rm -rf /var/lib/apt/lists/*
32+
RUN apt-get update && apt-get install -y --no-install-recommends \
33+
libc6-i386 \
34+
&& rm -rf /var/lib/apt/lists/*
2835

2936
# for redis-sentinel see: http://redis.io/topics/sentinel
30-
RUN set -ex \
37+
RUN set -ex; \
3138
\
32-
&& buildDeps=' \
39+
buildDeps=' \
40+
wget \
41+
\
3342
gcc \
3443
gcc-multilib \
3544
libc6-dev-i386 \
3645
make \
37-
' \
38-
&& apt-get update \
39-
&& apt-get install -y $buildDeps --no-install-recommends \
40-
&& rm -rf /var/lib/apt/lists/* \
46+
'; \
47+
apt-get update; \
48+
apt-get install -y $buildDeps --no-install-recommends; \
49+
rm -rf /var/lib/apt/lists/*; \
4150
\
42-
&& wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL" \
43-
&& echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c - \
44-
&& mkdir -p /usr/src/redis \
45-
&& tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1 \
46-
&& rm redis.tar.gz \
51+
wget -O redis.tar.gz "$REDIS_DOWNLOAD_URL"; \
52+
echo "$REDIS_DOWNLOAD_SHA *redis.tar.gz" | sha256sum -c -; \
53+
mkdir -p /usr/src/redis; \
54+
tar -xzf redis.tar.gz -C /usr/src/redis --strip-components=1; \
55+
rm redis.tar.gz; \
4756
\
4857
# Disable Redis protected mode [1] as it is unnecessary in context
4958
# of Docker. Ports are not automatically exposed when running inside
5059
# Docker, but rather explicitely by specifying -p / -P.
5160
# [1] https://github.com/antirez/redis/commit/edd4d555df57dc84265fdfb4ef59a4678832f6da
52-
&& grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h \
53-
&& sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h \
54-
&& grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h \
61+
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 1$' /usr/src/redis/src/server.h; \
62+
sed -ri 's!^(#define CONFIG_DEFAULT_PROTECTED_MODE) 1$!\1 0!' /usr/src/redis/src/server.h; \
63+
grep -q '^#define CONFIG_DEFAULT_PROTECTED_MODE 0$' /usr/src/redis/src/server.h; \
5564
# 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"
5665
# see also https://github.com/docker-library/redis/issues/4#issuecomment-50780840
5766
# (more exactly, this makes sure the default behavior of "save on SIGTERM" stays functional by default)
5867
\
59-
&& make -C /usr/src/redis 32bit \
60-
&& make -C /usr/src/redis install \
68+
make -C /usr/src/redis -j "$(nproc)" 32bit; \
69+
make -C /usr/src/redis install; \
6170
\
62-
&& rm -r /usr/src/redis \
71+
rm -r /usr/src/redis; \
6372
\
64-
&& apt-get purge -y --auto-remove $buildDeps
73+
apt-get purge -y --auto-remove $buildDeps
6574

6675
RUN mkdir /data && chown redis:redis /data
6776
VOLUME /data
@@ -71,4 +80,4 @@ COPY docker-entrypoint.sh /usr/local/bin/
7180
ENTRYPOINT ["docker-entrypoint.sh"]
7281

7382
EXPOSE 6379
74-
CMD [ "redis-server" ]
83+
CMD ["redis-server"]

0 commit comments

Comments
 (0)