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

[Paul Collins]

add image_flavour build arg, and use it; update README.md

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

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

[Junien F (axino)]

+1

review: Approve

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision 67430a17ef017525cdc81bfa71ac81a119ed0371

diff --git a/Dockerfile b/Dockerfile
index 14ed709..ee86adc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,8 +6,8 @@ SHELL ["/bin/bash", "-c"]
 ENV MM_VERSION=5.27.0
 ENV MM_WEBAPP=mattermost-webapp.tar.gz
 
-# Build argument to set Mattermost edition
 ARG edition=enterprise
+ARG image_flavour=default
 ARG PUID=2000
 ARG PGID=2000
 ARG MM_BINARY=
@@ -29,23 +29,41 @@ 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/${MM_WEBAPP} | tar -C /mattermost -xvz
+# Enable prepackaged plugin
+RUN if [ "$image_flavour" = canonical ]; then \
+        tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz ; \
+    fi
 
-RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-autolink-v1.1.2-linux-amd64.tar.gz
+# Enable prepackaged plugin
+RUN if [ "$image_flavour" = canonical ]; then \
+        tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v0.14.0-linux-amd64.tar.gz ; \
+    fi
 
-RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-github-v0.14.0-linux-amd64.tar.gz
+# Enable prepackaged plugin
+RUN if [ "$image_flavour" = canonical ]; then \
+        tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.1.0-linux-amd64.tar.gz ; \
+    fi
 
-RUN tar -C /mattermost/plugins -xvzf /mattermost/prepackaged_plugins/mattermost-plugin-gitlab-v1.1.0-linux-amd64.tar.gz
+# Download and enable third-party plugin
+RUN if [ "$image_flavour" = canonical ]; then \
+	cd /mattermost/plugins && \
+	set -o pipefail && \
+	curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v1.3.0/com.github.moussetc.mattermost.plugin.giphy-1.3.0.tar.gz | tar -xvz ; \
+    fi
 
-RUN cd /mattermost/plugins && \
-    set -o pipefail && \
-    curl -L https://github.com/moussetc/mattermost-plugin-giphy/releases/download/v1.3.0/com.github.moussetc.mattermost.plugin.giphy-1.3.0.tar.gz | tar -xvz
+# Download and enable third-party plugin
+RUN if [ "$image_flavour" = canonical ]; then \
+	cd /mattermost/plugins && \
+	set -o pipefail && \
+	curl -L https://github.com/scottleedavis/mattermost-plugin-remind/releases/download/0.4.4/com.github.scottleedavis.mattermost-plugin-remind-0.4.4.tar.gz | tar -xvz ; \
+    fi
 
-RUN cd /mattermost/plugins && \
-    set -o pipefail && \
-    curl -L https://github.com/scottleedavis/mattermost-plugin-remind/releases/download/0.4.4/com.github.scottleedavis.mattermost-plugin-remind-0.4.4.tar.gz | tar -xvz
+# Canonical's custom webapp
+RUN if [ "$image_flavour" = canonical ]; then \
+	rm -rf /mattermost/client && \
+	set -o pipefail && \
+	curl http://archive.admin.canonical.com/other/mattermost-webapp/${MM_VERSION}-canonical/${MM_WEBAPP} | tar -C /mattermost -xvz ; \
+    fi
 
 HEALTHCHECK CMD curl --fail http://localhost:8065 || exit 1
 
diff --git a/README.md b/README.md
index b023907..b1ce82e 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,20 @@
 # Mattermost Docker
 
 This project allows building a simple docker image of Mattermost.
-It does not include the databse.
+It does not include a database.
 
-The Mattermost configuration can be changed by setting MM_* environment variables, as explained in the Mattermost documentation:
+## Build Flavours
+
+This Dockerfile supports two "image flavours": a default flavour, and
+a "canonical" flavour.
+
+The "canonical" flavour is probably not directly useful unless you are
+updating Canonical's Mattermost, but may be of interest as it shows
+how to enable both prepackaged plugins and downloaded plugins.
+
+## Configuration
+
+As well as via the System Console, the Mattermost configuration can be changed by setting MM_* environment variables, as explained in the Mattermost documentation:
 > Find the setting in config.json. In this case, ServiceSettings.SiteURL.
 >
 > Add MM_ to the beginning and convert all characters to uppercase and replace the . with _. For example, MM_SERVICESETTINGS_SITEURL.
@@ -11,3 +22,6 @@ The Mattermost configuration can be changed by setting MM_* environment variable
 > The setting becomes export MM_SERVICESETTINGS_SITEURL="http://example.com".
 
 https://docs.mattermost.com/administration/config-settings.html
+
+Note that configuration values set in this manner are no longer
+changeable via the System Console.