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

[Paul Collins]

convert ENV to ARG, rename and lowercase. add some labels

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

Change successfully merged at revision 1e4b5d68825f1a549b6a9f7eaf3c662e93a82f48

diff --git a/Dockerfile b/Dockerfile
index ee86adc..be91652 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,16 @@ FROM ubuntu:focal
 # We use "set -o pipefail"
 SHELL ["/bin/bash", "-c"]
 
-ENV MM_VERSION=5.27.0
-ENV MM_WEBAPP=mattermost-webapp.tar.gz
-
 ARG edition=enterprise
 ARG image_flavour=default
-ARG PUID=2000
-ARG PGID=2000
-ARG MM_BINARY=
+ARG mattermost_gid=2000
+ARG mattermost_uid=2000
+ARG mattermost_version=5.27.0
+ARG mattermost_webapp=mattermost-webapp.tar.gz
+
+LABEL org.label-schema.version=${mattermost_version}
+LABEL com.canonical.image-flavour=${image_flavour}
+LABEL com.canonical.mattermost-edition=${edition}
 
 RUN apt-get -qy update && \
     apt-get -qy dist-upgrade && \
@@ -19,15 +21,20 @@ RUN apt-get -qy update && \
 
 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 \
-        curl https://releases.mattermost.com/$MM_VERSION/mattermost-team-$MM_VERSION-linux-amd64.tar.gz | tar -xvz ; \
-    else \
-        curl https://releases.mattermost.com/$MM_VERSION/mattermost-$MM_VERSION-linux-amd64.tar.gz | tar -xvz ; \
-    fi && \
-    addgroup --gid ${PGID} mattermost && \
-    adduser --no-create-home --disabled-password --gecos "" --uid ${PUID} --gid ${PGID} --home /mattermost mattermost
+    case $edition in \
+    enterprise) \
+        curl https://releases.mattermost.com/$mattermost_version/mattermost-$mattermost_version-linux-amd64.tar.gz | tar -xvz ; \
+        ;; \
+    team) \
+        curl https://releases.mattermost.com/$mattermost_version/mattermost-team-$mattermost_version-linux-amd64.tar.gz | tar -xvz ; \
+        ;; \
+    *) \
+        echo "E: Unknown edition ${edition}!  Cannot continue." >&2 ; \
+	exit 1 ; \
+        ;; \
+    esac && \
+    addgroup --gid ${mattermost_gid} mattermost && \
+    adduser --no-create-home --disabled-password --gecos "" --uid ${mattermost_uid} --gid ${mattermost_gid} --home /mattermost mattermost
 
 # Enable prepackaged plugin
 RUN if [ "$image_flavour" = canonical ]; then \
@@ -62,7 +69,7 @@ RUN if [ "$image_flavour" = canonical ]; then \
 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 ; \
+	curl http://archive.admin.canonical.com/other/mattermost-webapp/${mattermost_version}-canonical/${mattermost_webapp} | tar -C /mattermost -xvz ; \
     fi
 
 HEALTHCHECK CMD curl --fail http://localhost:8065 || exit 1