Merge ~pjdc/charm-k8s-mattermost/+git/image-build:install-patched-webapp into ~mattermost-charmers/charm-k8s-mattermost/+git/mattermost-k8s-image-builder:master

[Paul Collins]

Install patched webapp with Canonical themes

[🤖 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)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Benjamin Allot (ballot)]

LGTM with an inline comment

review: Approve

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

Change has no commit message, setting status to needs review.

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

Change has no commit message, setting status to needs review.

[Tom Haddon (mthaddon)]

This is fine for now, but would like to chat on Monday/Tuesday (depending on which timezone you're in) about whether it's possible to build the patching of the web app into the docker build, otherwise we're going to need to manually build a patched version of the webapp every time a new one is released, which is going to make the upgrade process painful.

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

Change successfully merged at revision b992e0d37b9186943ff43797995f384bb8f47adc

diff --git a/Dockerfile b/Dockerfile
index 8529727..53f1d91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:focal
 
-ENV MM_VERSION=5.22.1
+ENV MM_VERSION=5.23.1
 
 # Build argument to set Mattermost edition
 ARG edition=enterprise
@@ -10,9 +10,11 @@ ARG MM_BINARY=
 
 RUN apt-get -qy update && \
     apt-get -qy dist-upgrade && \
-    apt-get -qy install curl
+    apt-get -qy install curl && \
+    rm -f /var/lib/apt/lists/*_*
 
 RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins && \
+    set -o pipefail && \
     if [ ! -z "$MM_BINARY" ] ; then \
         curl $MM_BINARY | tar -xvz ; \
     elif [ "$edition" = "team" ] ; then \
@@ -23,9 +25,15 @@ RUN mkdir -p /mattermost/data /mattermost/plugins /mattermost/client/plugins && 
     addgroup --gid ${PGID} mattermost && \
     adduser --no-create-home --disabled-password --gecos "" --uid ${PUID} --gid ${PGID} --home /mattermost mattermost
 
+RUN rm -rf /mattermost/client && \
+    set -o pipefail && \
+    curl http://archive.admin.canonical.com/other/mattermost-webapp/${MM_VERSION}-canonical/mattermost-webapp.tar.gz | tar -C /mattermost -xvz
+
 RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz
 
-RUN cd /mattermost/plugins && curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v1.2.1/com.github.moussetc.mattermost.plugin.giphy-1.2.1.tar.gz | tar -xvz
+RUN cd /mattermost/plugins && \
+    set -o pipefail && \
+    curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v1.2.1/com.github.moussetc.mattermost.plugin.giphy-1.2.1.tar.gz | tar -xvz
 
 HEALTHCHECK CMD curl --fail http://localhost:8065 || exit 1