Merge ~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse:master into charm-k8s-discourse:master

[Barry Price]

Add terser to our image, and use it for asset compression instead of uglifier

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

FAILED: Continuous integration, rev:0f7ae1662ddb03ea2f7a4cda739dec0ebb23c040
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/151/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/574709/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/36//rebuild

review: Needs Fixing (continuous-integration)

[Joel Sing (jsing)]

LGTM, see comment (if it is easily fixed/tested then we can, otherwise ignore it)

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Merge proposal is approved, but source revision has changed, setting status to needs review.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

FAILED: Continuous integration, rev:37b98a2424527ab37d1e8dfda481bdb78683f8f9
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/37/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/152/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/574766/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-discourse-ci/37//rebuild

review: Needs Fixing (continuous-integration)

[Romain Couturat (romaincout)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 6cac70c95ff72b74107ba4068a628f06a7091870

diff --git a/image/build_scripts/build_app b/image/build_scripts/build_app
index cb0f0e0..9d6d04a 100755
--- a/image/build_scripts/build_app
+++ b/image/build_scripts/build_app
@@ -14,9 +14,10 @@ cd ${CONTAINER_APP_ROOT}
 git clone --depth 1 --branch ${CONTAINER_APP_VERSION} https://github.com/discourse/discourse.git ${CONTAINER_APP_VERSION}
 
 # Apply patch for LP#1903695
-cd ${CONTAINER_APP_VERSION}
-git apply /srv/build_scripts/lp1903695.patch
-cd ${CONTAINER_APP_ROOT}
+git -C "${CONTAINER_APP_VERSION}" apply /srv/build_scripts/lp1903695.patch
+
+# Apply patch to use terser rather than uglifier
+git -C "${CONTAINER_APP_VERSION}" apply /srv/build_scripts/terser.patch
 
 chown -R ${CONTAINER_APP_USERNAME}:${CONTAINER_APP_GROUP} ${CONTAINER_APP_VERSION}
 ln -s ${CONTAINER_APP_ROOT}/${CONTAINER_APP_VERSION} app
diff --git a/image/build_scripts/get_app_dependencies b/image/build_scripts/get_app_dependencies
index 0c78012..8f9a0f6 100755
--- a/image/build_scripts/get_app_dependencies
+++ b/image/build_scripts/get_app_dependencies
@@ -16,6 +16,7 @@ apt-get install -y brotli \
                    libxml2-dev \
                    libxslt1-dev \
                    libz-dev \
+                   node-terser \
                    node-uglify \
                    optipng \
                    pngquant \
diff --git a/image/build_scripts/terser.patch b/image/build_scripts/terser.patch
 new file mode 100644
index 0000000..55e20ff
--- /dev/null
+++ b/image/build_scripts/terser.patch
@@ -0,0 +1,13 @@
+diff --git a/config/environments/production.rb b/config/environments/production.rb
+index a523888a8d..7f41985b17 100644
+--- a/config/environments/production.rb
++++ b/config/environments/production.rb
+@@ -14,7 +14,7 @@ Discourse::Application.configure do
+   # Disable Rails's static asset server (Apache or nginx will already do this)
+   config.public_file_server.enabled = GlobalSetting.serve_static_assets || false
+ 
+-  config.assets.js_compressor = :uglifier
++  config.assets.js_compressor = :terser
+ 
+   # stuff should be pre-compiled
+   config.assets.compile = false