From d5c4bf2860dfa5dd8fcc69146096f997e434d067 Mon Sep 17 00:00:00 2001
From: Dan Ungureanu <dan@ungureanu.me>
Date: Fri, 1 Feb 2019 06:59:08 +0200
Subject: [PATCH] Build Redis from source. (#417)

---
 image/base/Dockerfile    |  7 +++++--
 image/base/install-redis | 33 +++++++++++++++++++++++++++++++++
 image/base/redis         | 12 ++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100755 image/base/install-redis
 create mode 100644 image/base/redis

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 7ab5907..76c4569 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -38,7 +38,7 @@ RUN sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron
 RUN sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf
 RUN dpkg-divert --local --rename --add /sbin/initctl
 RUN sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl"
-RUN apt-get -y install redis-server haproxy openssh-server
+RUN apt-get -y install haproxy openssh-server
 RUN cd / &&\
     apt-get -y install runit monit socat &&\
     mkdir -p /etc/runit/1.d &&\
@@ -77,6 +77,9 @@ RUN gem install bundler --force &&\
     rm -rf /usr/local/share/ri/2.5.2/system &&\
     cd / && git clone https://github.com/discourse/pups.git
 
+ADD install-redis /tmp/install-redis
+RUN /tmp/install-redis
+
 ADD install-imagemagick /tmp/install-imagemagick
 RUN /tmp/install-imagemagick
 
@@ -128,7 +131,7 @@ ADD boot /sbin/boot
 ADD cron /etc/service/cron/run
 ADD rsyslog /etc/service/rsyslog/run
 ADD cron.d_anacron /etc/cron.d/anacron
-
+ADD redis /etc/service/redis/run
 
 # Discourse specific bits
 RUN useradd discourse -s /bin/bash -m -U &&\
diff --git a/image/base/install-redis b/image/base/install-redis
new file mode 100755
index 0000000..0577bbb
--- /dev/null
+++ b/image/base/install-redis
@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+REDIS_VERSION=5.0.3
+REDIS_DOWNLOAD_SHA=e290b4ddf817b26254a74d5d564095b11f9cd20d8f165459efa53eb63cd93e02
+
+cd /tmp
+
+# Prepare Redis source.
+wget http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz
+echo "$REDIS_DOWNLOAD_SHA redis-$REDIS_VERSION.tar.gz" | sha256sum -c -
+tar zxf redis-$REDIS_VERSION.tar.gz
+cd redis-$REDIS_VERSION
+
+# Building and installing binaries.
+make && make install PREFIX=/usr
+
+# Add `redis` user and group.
+adduser --system --home /var/lib/redis --quiet --group redis || true
+
+# Configure Redis.
+mkdir -p /etc/redis
+mkdir -p /var/lib/redis
+mkdir -p /var/log/redis
+cp /tmp/redis-$REDIS_VERSION/redis.conf /etc/redis
+
+chown -R redis:redis /var/lib/redis
+chmod 750 /var/lib/redis
+
+chown -R redis:redis /var/log/redis
+chmod 750 /var/log/redis
+
+# Clean up.
+cd / && rm -rf /tmp/redis*
diff --git a/image/base/redis b/image/base/redis
new file mode 100644
index 0000000..bfadf8c
--- /dev/null
+++ b/image/base/redis
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+RUNDIR=/var/run/redis
+PIDFILE=/var/run/redis/redis-server.pid
+
+mkdir -p $RUNDIR
+touch $PIDFILE
+chown -R redis:redis $RUNDIR
+chmod 755 $RUNDIR
+
+exec chpst -u redis /usr/bin/redis-server /etc/redis/redis.conf
-- 
2.25.1