[discourse-web/flathub] Drop redis section as we run it from separate image



commit 245543e8857a8c104ee0b61c40c46ac600c15e6c
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Wed Oct 7 12:46:37 2020 +0200

    Drop redis section as we run it from separate image

 Dockerfile   | 16 ++--------------
 run-redis.sh |  7 -------
 2 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index fbaf6da..85d03ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,18 +23,6 @@ RUN \
   chgrp -R 0 /etc/nginx/ /var/run /var/cache/nginx /var/lib/nginx /var/log/nginx && \
   chmod -R g=u /etc/nginx/ /var/run /var/cache/nginx /var/lib/nginx /var/log/nginx
 
-### Configure Redis
-RUN \
-    chgrp -R 0 /var/lib/redis && \
-    chmod -R g=u /var/lib/redis && \
-    # Follow up on https://github.com/discourse/discourse_docker/blob/master/templates/redis.template.yml
-    sed -i 's|daemonize yes|daemonize no|' /etc/redis/redis.conf && \
-    sed -i 's/^pidfile.*$//' /etc/redis/redis.conf && \
-    sed -i 's/^logfile.*$/logfile \"\"/' /etc/redis/redis.conf && \
-    sed -i 's/^bind .*$//' /etc/redis/redis.conf && \
-    sed -i 's/^dir .*$/dir \/shared\/redis_data\//' /etc/redis/redis.conf && \
-    sed -i 's/^protected-mode yes/protected-mode no/' /etc/redis/redis.conf
-    
 ### Discourse specific bits
 
 # Install modified version of Discourse
@@ -100,8 +88,8 @@ RUN exec bundle install --deployment --jobs 4 --without test --without developme
     exec bundle exec rake maxminddb:get && \
     find /discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +
 
-COPY ["cgroup-limits","init-dbmigration.sh","run-discourse.sh","run-nginx.sh","run-redis.sh","./"]
-RUN chmod +x ./run-discourse.sh ./run-nginx.sh ./run-redis.sh ./init-dbmigration.sh && \
+COPY ["cgroup-limits","init-dbmigration.sh","run-discourse.sh","run-nginx.sh","./"]
+RUN chmod +x ./run-discourse.sh ./run-nginx.sh ./init-dbmigration.sh && \
     chgrp -R 0 /discourse && chmod -R g=u /discourse && \
     chmod +x /discourse/config/unicorn_launcher
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]