From: Gabe Pacuilla <gabe@discourse.org>
Date: Thu, 24 Feb 2022 19:14:33 +0000 (-0500)
Subject: DEV: compile redis with TLS support in our base image (#606)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8b0ae9b4da2f48d62d7a88035018dba403918325;p=discourse_docker.git

DEV: compile redis with TLS support in our base image (#606)
---

diff --git a/image/base/install-redis b/image/base/install-redis
index bc661b3..8c2b62e 100755
--- a/image/base/install-redis
+++ b/image/base/install-redis
@@ -15,7 +15,7 @@ tar zxf redis-$REDIS_VERSION.tar.gz
 cd redis-$REDIS_VERSION
 
 # Building and installing binaries.
-make && make install PREFIX=/usr
+make BUILD_TLS=yes && make install PREFIX=/usr
 
 # Add `redis` user and group.
 adduser --system --home /var/lib/redis --quiet --group redis || true
diff --git a/image/base/slim.Dockerfile b/image/base/slim.Dockerfile
index 3c892fe..9f5f57a 100644
--- a/image/base/slim.Dockerfile
+++ b/image/base/slim.Dockerfile
@@ -34,7 +34,7 @@ RUN apt -y update
 # install these without recommends to avoid pulling in e.g.
 # X11 libraries, mailutils
 RUN apt -y install --no-install-recommends git rsyslog logrotate cron ssh-client less
-RUN apt -y install build-essential rsync \
+RUN apt -y install build-essential ca-certificates rsync \
                        libxslt-dev libcurl4-openssl-dev \
                        libssl-dev libyaml-dev libtool \
                        libxml2-dev gawk parallel \