wordpress-charmers team mailing list archive

[Tom Haddon <tom.haddon@xxxxxxxxxxxxx>]

Tom Haddon has proposed merging ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:dockerfile-cleanup into charm-k8s-wordpress:master.

Commit message:
Remove duplicated argument and label definition from Dockerfile

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress/+merge/396038

Remove duplicated argument and label definition from Dockerfile
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~mthaddon/charm-k8s-wordpress/+git/charm-k8s-wordpress:dockerfile-cleanup into charm-k8s-wordpress:master.

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="wordpress-charmers@xxxxxxxxxxxxxxxxxxx"
-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.