Merge ~jk0ne/charm-k8s-discourse/+git/discourse-k8s-image-builder:master into ~discourse-charmers/charm-k8s-discourse/+git/discourse-k8s-image-builder:master

Proposed by Jay Kuri
Status: Merged
Approved by: Tom Haddon
Approved revision: c6c66444d0d41627b2b3bb8d92753e73a21e1e50
Merged at revision: 43450e9dc5d7da4a0ff94d030707212645223083
Proposed branch: ~jk0ne/charm-k8s-discourse/+git/discourse-k8s-image-builder:master
Merge into: ~discourse-charmers/charm-k8s-discourse/+git/discourse-k8s-image-builder:master
Diff against target: 42 lines (+4/-7)
3 files modified
scripts/app_launch (+1/-4)
scripts/assets/discourse.conf.tmpl (+1/-1)
scripts/pod_start (+2/-2)
Reviewer Review Type Date Requested Status
Joel Sing (community) +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+387226@code.launchpad.net

Commit message

use CONTAINER_APP_NAME in pod-setup exit status messaging

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Joel Sing (jsing) wrote :

LGTM

review: Approve (+1)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 43450e9dc5d7da4a0ff94d030707212645223083

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/app_launch b/scripts/app_launch
2index 87f7166..0beae97 100755
3--- a/scripts/app_launch
4+++ b/scripts/app_launch
5@@ -4,10 +4,7 @@ cd ${CONTAINER_APP_ROOT}/app
6
7 export RAILS_ENV=${DISCOURSE_RAILS_ENVIRONMENT:-production}
8 export UNICORN_BIND_ALL=0.0.0.0
9-
10-if [ "${DISCOURSE_ENABLE_LOCAL_SIDEKIQ}" == "true" ]; then
11- export UNICORN_SIDEKIQS=1
12-fi
13+export UNICORN_SIDEKIQS=1
14
15 # Putting the tail's in the background gets the various logs outputting to
16 # stdout. The sed allows us to distinguish where a given log line comes form.
17diff --git a/scripts/assets/discourse.conf.tmpl b/scripts/assets/discourse.conf.tmpl
18index 4cc13b9..f1e2270 100644
19--- a/scripts/assets/discourse.conf.tmpl
20+++ b/scripts/assets/discourse.conf.tmpl
21@@ -1,6 +1,6 @@
22 hostname = $DISCOURSE_HOSTNAME
23 developer_emails = $DISCOURSE_DEVELOPER_EMAILS
24-serve_static_assets = $DISCOURSE_SERVE_STATIC_ASSETS
25+serve_static_assets = true
26 db_host = $DISCOURSE_POSTGRES_HOST
27 db_username = $DISCOURSE_POSTGRES_USERNAME
28 db_password = $DISCOURSE_POSTGRES_PASSWORD
29diff --git a/scripts/pod_start b/scripts/pod_start
30index 30b80c2..fd3d95f 100755
31--- a/scripts/pod_start
32+++ b/scripts/pod_start
33@@ -20,9 +20,9 @@ echo "Pod setup starting..."
34 SETUP_EXIT=$?
35
36 if [ $SETUP_EXIT -eq 0 ]; then
37- echo "Pod setup completed successfully."
38+ echo "${CONTAINER_APP_NAME} setup completed successfully."
39 else
40- echo "Pod setup failed with exit code: " $SETUP_EXIT
41+ echo "${CONTAINER_APP_NAME} setup failed with exit code: " $SETUP_EXIT
42 fi
43
44

Subscribers

People subscribed via source and target branches