community: workaround git tag checkout bug

[chef.git] / cookbooks / community / templates / default / web_only.yml.erb

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index a3f47dbbef353c9fe6614c631851252c0e4e2527..401a18c5183d7538f2a9a2ca7c0c6eb273ad4a50 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -19,8 +19,9 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
 # any extra arguments for Docker?
 # docker_args:
 

-params:
-  version: v2.8.1
+# Workaround bug: https://github.com/discourse/discourse_docker/pull/505
+# params:
+#  version: v2.8.1

 
 env:
   LC_ALL: en_US.UTF-8
 
 env:
   LC_ALL: en_US.UTF-8


@@ -53,7 +54,7 @@ env:
   DISCOURSE_SMTP_PASSWORD:
   # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org
   DISCOURSE_SMTP_PASSWORD:
   # DISCOURSE_SMTP_ENABLE_START_TLS: true           # (optional, default true)
   DISCOURSE_SMTP_DOMAIN: community.openstreetmap.org

-  DISCOURSE_NOTIFICATION_EMAIL: noreply@community.openstreetmap.org
+  DISCOURSE_NOTIFICATION_EMAIL: community@noreply.openstreetmap.org

 
   ## TODO: configure connectivity to the databases
   DISCOURSE_DB_SOCKET: ''
 
   ## TODO: configure connectivity to the databases
   DISCOURSE_DB_SOCKET: ''


@@ -92,6 +93,11 @@ hooks:
           - git clone --depth 1 https://github.com/discourse/discourse-solved.git
           - git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
           - git clone --depth 1 https://github.com/discourse/discourse-reactions.git
           - git clone --depth 1 https://github.com/discourse/discourse-solved.git
           - git clone --depth 1 https://github.com/discourse/discourse-canned-replies.git
           - git clone --depth 1 https://github.com/discourse/discourse-reactions.git

+    - exec:
+        cd: $home
+        cmd:
+          - git fetch --depth=1 origin tag v2.8.1 --no-tags
+          - git checkout v2.8.1

   after_ssl:
     - file:
         path: "/etc/nginx/letsencrypt.conf"
   after_ssl:
     - file:
         path: "/etc/nginx/letsencrypt.conf"