From 417c5c2f99cd19e62fe1f903718f1c7e34428d5e Mon Sep 17 00:00:00 2001
From: Timothee Gosselin <timothee@indie.host>
Date: Tue, 27 Nov 2018 11:54:26 +0100
Subject: [PATCH] update discourse & pass versions as env var

---
 docker-compose.yml | 15 ++++++++-------
 scripts/install    |  6 ++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index be85598..6216583 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ networks:
       - subnet: 10.0.${SUBNET}.0/24
 services:
   web:
-    image: indiehosters/docker-discourse-web:2.0.0.beta5
+    image: indiehosters/discourse-web:${DISCOURSE_VERSION:-2.2.0.beta4}
     volumes:
     - ./data/assets:/home/discourse/discourse/public/assets
     - ./data/uploads:/home/discourse/discourse/public/uploads
@@ -22,29 +22,30 @@ services:
     depends_on:
     - app
   app:
-    image: indiehosters/discourse:2.0.0.beta5
+    image: indiehosters/discourse:${DISCOURSE_VERSION:-2.2.0.beta4}
     volumes:
     - ./data/assets:/home/discourse/discourse/public/assets
     - ./data/uploads:/home/discourse/discourse/public/uploads
     - ./data/backups:/home/discourse/discourse/public/backups
     environment:
-    - DISCOURSE_HOSTNAME=$VIRTUAL_HOST
+    - DISCOURSE_HOSTNAME
     - POSTGRES_USER=discourse
     - DISCOURSE_SMTP_PORT=587
     - DISCOURSE_SMTP_ADDRESS
     - DISCOURSE_SMTP_USER_NAME
     - DISCOURSE_SMTP_PASSWORD
     - DISCOURSE_DB_PASSWORD
+    - DISCOURSE_DB_HOST=postgres
     depends_on:
     - redis
     - postgres
     networks:
     - back
   sidekiq:
-    image: indiehosters/discourse:2.0.0.beta5
+    image: indiehosters/discourse:${DISCOURSE_VERSION:-2.2.0.beta4}
     command: bundle exec sidekiq -q critical -q default -q low -v
     environment:
-    - DISCOURSE_HOSTNAME=$VIRTUAL_HOST
+    - DISCOURSE_HOSTNAME
     - POSTGRES_USER=discourse
     - DISCOURSE_SMTP_PORT=587
     - DISCOURSE_SMTP_ADDRESS
@@ -57,7 +58,7 @@ services:
     networks:
     - back
   postgres:
-    image: postgres:9.5
+    image: postgres:${POSTGRES_VERSION:-10.6}
     volumes:
     - ./data/postgres:/var/lib/postgresql/data
     networks:
@@ -66,7 +67,7 @@ services:
     - POSTGRES_USER=discourse
     - POSTGRES_PASSWORD
   redis:
-    image: redis:3-alpine
+    image: redis:${REDIS_VERSION:-4-alpine}
     command: ["--appendonly","yes"]
     networks:
     - back
diff --git a/scripts/install b/scripts/install
index 67cbaa8..9fc21eb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -8,15 +8,13 @@ echo "DISCOURSE_SMTP_PASSWORD=${MAIL_PASS}" >> .env
 echo "DISCOURSE_DB_PASSWORD=${PG_PASSWORD}" >> .env
 echo "POSTGRES_PASSWORD=${PG_PASSWORD}" >> .env
 echo "SUBNET=${SUBNET:-0}" >> .env
+echo "POSTGRES_VERSION=10.6" >> .env
 
 mkdir -p ./data/{assets,uploads,backups,redis,postgres}
 
 chown -R 1000:1000 ./data/
 
-VIRTUAL_HOST=${URL} docker-compose run app bash -c "sleep 60 && rake db:migrate assets:precompile"
+VIRTUAL_HOST=${URL} docker-compose run app bash -c "sleep 60 && bundle exec rake maxminddb:get db:migrate assets:precompile"
 VIRTUAL_HOST=${URL} docker-compose run app bash -c "rake admin:create"
 
 echo "!!!Configure notification email in discourse settings!!!!!!"
-
-
-
-- 
GitLab