Merge branch 'develop'

EpicMorg · Jan 30, 2020 · 1d0c3e8 · 1d0c3e8
2 parents 058ee75 + fcfee13
commit 1d0c3e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile
@@ -5,17 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #   Build-time metadata as defined at http://label-schema.org
 ##################################################################
-ARG BUILD_DATE=today
-ARG VCS_REF=master
-ARG VERSION=latest
-LABEL org.label-schema.build-date=$BUILD_DATE \
+LABEL org.label-schema.build-date=${date} \
           org.label-schema.name="Docker Scripts" \
           org.label-schema.description="Image for our docker containers." \
           org.label-schema.url="https://ww.epicm.org/" \
-          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-ref=master \
           org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
           org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=$VERSION \
+          org.label-schema.version=1.17.8 \
           org.label-schema.schema-version="1.0"
 
 ##################################################################
@@ -178,17 +175,14 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #   Build-time metadata as defined at http://label-schema.org
 ##################################################################
-ARG BUILD_DATE=today
-ARG VCS_REF=master
-ARG VERSION=latest
-LABEL org.label-schema.build-date=$BUILD_DATE \
+LABEL org.label-schema.build-date=${date} \
           org.label-schema.name="Docker Scripts" \
           org.label-schema.description="Image for our docker containers." \
           org.label-schema.url="https://ww.epicm.org/" \
-          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-ref=master \
           org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
           org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=$VERSION \
+          org.label-schema.version=1.17.8 \
           org.label-schema.schema-version="1.0"
 
 ##################################################################

diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile
@@ -5,17 +5,14 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #   Build-time metadata as defined at http://label-schema.org
 ##################################################################
-ARG BUILD_DATE=today
-ARG VCS_REF=master
-ARG VERSION=latest
-LABEL org.label-schema.build-date=$BUILD_DATE \
+LABEL org.label-schema.build-date=${date} \
           org.label-schema.name="Docker Scripts" \
           org.label-schema.description="Image for our docker containers." \
           org.label-schema.url="https://ww.epicm.org/" \
-          org.label-schema.vcs-ref=$VCS_REF \
+          org.label-schema.vcs-ref=master \
           org.label-schema.vcs-url="https://github.com/EpicMorg/docker-scripts" \
           org.label-schema.vendor="EpicMorg" \
-          org.label-schema.version=$VERSION \
+          org.label-schema.version=1.17.8 \
           org.label-schema.schema-version="1.0"
 
 ##################################################################