From 5d1c93ec7fba1f235a726dfd62fcc6fc608e86b4 Mon Sep 17 00:00:00 2001
From: Buleandra Cristian <cristian.buleandra@gmail.com>
Date: Sat, 10 Dec 2022 02:54:31 +0100
Subject: [PATCH] Make Discourse work with latest versions (2.4.4->2.8.11)
 (#804)

See this issue: https://github.com/caprover/one-click-apps/issues/803

Not so sure about the CMD change (from nami start to bitnami run.sh), but `nami` was not defined anymore, and this seems to work.
---
 public/v4/apps/discourse.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/v4/apps/discourse.yml b/public/v4/apps/discourse.yml
index d6df6ad..093c8c9 100644
--- a/public/v4/apps/discourse.yml
+++ b/public/v4/apps/discourse.yml
@@ -5,7 +5,10 @@ services:
         image: docker.io/bitnami/postgresql:$$cap_postgresql_version
         restart: always
         environment:
-            ALLOW_EMPTY_PASSWORD: yes
+            POSTGRESQL_DATABASE: $$cap_db_name
+            POSTGRESQL_USERNAME: $$cap_db_user
+            POSTGRESQL_PASSWORD: $$cap_db_pass
+            POSTGRESQL_POSTGRES_PASSWORD: $$cap_db_pass
         volumes:
             - $$cap_appname-postgresql-data:/bitnami/postgresql
         caproverExtra:
@@ -34,6 +37,7 @@ services:
             POSTGRESQL_CLIENT_CREATE_DATABASE_NAME: $$cap_db_name
             POSTGRESQL_CLIENT_CREATE_DATABASE_USERNAME: $$cap_db_user
             POSTGRESQL_CLIENT_CREATE_DATABASE_PASSWORD: $$cap_db_pass
+            POSTGRESQL_CLIENT_POSTGRES_PASSWORD: $$cap_db_pass
             DISCOURSE_USERNAME: $$cap_admin_user
             DISCOURSE_PASSWORD: $$cap_admin_pass
             DISCOURSE_EMAIL: $$cap_admin_email
@@ -71,18 +75,18 @@ services:
         caproverExtra:
             dockerfileLines:
                 - FROM docker.io/bitnami/discourse:$$cap_discourse_version
-                - CMD ["nami" , "start" , "--foreground" , "discourse-sidekiq"]
+                - CMD ["/opt/bitnami/scripts/discourse-sidekiq/run.sh"]
             notExposeAsWebApp: 'true'
 caproverOneClickApp:
     variables:
         - id: $$cap_discourse_version
           label: Discourse Version
-          defaultValue: 2.4.4
+          defaultValue: 2.8.11
           description: Version of Discourse
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_postgresql_version
           label: Postgresql (database) version
-          defaultValue: '11'
+          defaultValue: 15.1.0
           description: Version of Postgresql
           validRegex: /^([^\s^\/])+$/
         - id: $$cap_sitename