Merge ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:dockerfile-cleanup into charm-k8s-wordpress:master

[Tom Haddon]

Remove duplicated argument and label definition from Dockerfile

Remove duplicated argument and label definition from Dockerfile

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

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

[Laurent Sesquès (sajoupa)]

review: Approve

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

Change successfully merged at revision f7316fa1c552d60a5865c3edad746c5920c65778

diff --git a/Dockerfile b/Dockerfile
index 7603e5c..50a5120 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,15 +4,13 @@ ARG DIST_RELEASE
 ARG VERSION
 
 LABEL maintainer="[e-mail]"
-LABEL org.label-schema.version=${DIST_RELEASE}-${VERSION}
+# Used by Launchpad OCI Recipe to tag version
+LABEL org.label-schema.version=${VERSION:-5.6}
 
 # HTTPS_PROXY used when we RUN curl to download Wordpress itself
 ARG BUILD_DATE
 ARG HTTPS_PROXY
-ARG VERSION
 
-# Used by Launchpad OCI Recipe to tag version
-LABEL org.label-schema.version=${VERSION:-5.6}
 
 # Launchpad OCI image builds don't support dynamic arg parsing. Skip until
 # https://bugs.launchpad.net/launchpad/+bug/1902010 is resolved.