[discourse-web/flathub: 2/2] Remove nginx and redis, switch to stable
- From: Bartłomiej Piotrowski <bpiotrowski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [discourse-web/flathub: 2/2] Remove nginx and redis, switch to stable
- Date: Fri, 18 Sep 2020 12:12:21 +0000 (UTC)
commit 003f2a14ee60089a13517b39b648bb2c9d50901f
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date: Fri Sep 18 14:11:59 2020 +0200
Remove nginx and redis, switch to stable
Dockerfile | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index eb188aa..3c39141 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,39 +1,14 @@
# Check https://github.com/discourse/discourse_docker/blob/master/launcher
FROM discourse/base:2.0.20200724-1815
-ENV PG_MAJOR 11
ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1
ENV RAILS_ENV production
RUN DEBIAN_FRONTEND=noninteractive apt -y update && apt -y install gettext && apt clean
-### Configure Nginx
-### n.b.: https://www.redpill-linpro.com/sysadvent/2017/12/10/jekyll-openshift.html
-### /var/run is configured for different pids. Check unicorn.conf.rb and sidekiq.yml configurations.
-RUN \
- ln -sf /dev/stdout /var/log/nginx/access.log && \
- ln -sf /dev/stderr /var/log/nginx/error.log && \
- mkdir -p /etc/nginx/ /var/run /var/cache/nginx /var/lib/nginx /var/log/nginx && \
- 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
# we can override it with --build_arg
-ARG DISCOURSE_VERS='tests-passed'
+ARG DISCOURSE_VERS='stable'
ENV DISCOURSE_RELEASE=$DISCOURSE_VERS RAILS_ROOT=/discourse HOME=/discourse
# Remove upstream discourse installation, so we will pre-cook ours.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]