From: Sam <sam.saffron@gmail.com>
Date: Thu, 2 Aug 2018 07:00:20 +0000 (+1000)
Subject: FEATURE: disable huge pages in PG, web and redis
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1404e881d1e655ca5703bb2dc80b4042f938ead4;p=discourse_docker.git

FEATURE: disable huge pages in PG, web and redis
---

diff --git a/launcher b/launcher
index f34acc9..ae41c18 100755
--- a/launcher
+++ b/launcher
@@ -64,7 +64,7 @@ git_rec_version='1.8.0'
 config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
-image=discourse/base:2.0.20180717
+image=discourse/base:2.0.20180802
 docker_path=`which docker.io || which docker`
 git_path=`which git`
 
diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index 30daf5f..3214e7c 100644
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -36,7 +36,7 @@ run:
      contents: |
         #!/bin/sh
         exec 2>&1
-        HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
+        HOME=/var/lib/postgresql USER=postgres exec thpoff chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
 
   - file:
      path: /etc/service/postgres/log/run
diff --git a/templates/redis.template.yml b/templates/redis.template.yml
index ab9ceb8..c69a736 100644
--- a/templates/redis.template.yml
+++ b/templates/redis.template.yml
@@ -5,7 +5,7 @@ run:
      contents: |
         #!/bin/sh
         exec 2>&1
-        exec chpst -u redis -U redis /usr/bin/redis-server /etc/redis/redis.conf
+        exec thpoff chpst -u redis -U redis /usr/bin/redis-server /etc/redis/redis.conf
   - file:
      path: /etc/service/redis/log/run
      chmod: "+x"
diff --git a/templates/web.template.yml b/templates/web.template.yml
index b20fec9..cc19d92 100644
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -64,7 +64,7 @@ run:
         # postgres
         cd $home
         chown -R discourse:www-data /shared/log/rails
-        LD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
+        LD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec thpoff chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
 
   - file:
      path: /etc/service/nginx/run