Makefile improvements.
- Added image double-tagging, images are now always tagged with :latest.
- Version control DIRTY flag is:
- a) Injected into containers properly on build.
- b) Used to append -dirty to the image tag. (:latest is unaffected.)
- Re-added DOCKER_BUILD_ARGS to deduplicate code (not sure why this was changed).
Change-Id: I12a40e0e718abcdaedbbf85622856d3d4104d05d
diff --git a/docker/Dockerfile.afrouter b/docker/Dockerfile.afrouter
index de2646f..e604e2c 100644
--- a/docker/Dockerfile.afrouter
+++ b/docker/Dockerfile.afrouter
@@ -64,6 +64,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=afrouter \
@@ -71,4 +72,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-commit-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.afrouterTest b/docker/Dockerfile.afrouterTest
index 3f159d6..c93570e 100644
--- a/docker/Dockerfile.afrouterTest
+++ b/docker/Dockerfile.afrouterTest
@@ -78,6 +78,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=afroutertest \
@@ -85,4 +86,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.afrouterd b/docker/Dockerfile.afrouterd
index 242984a..123a5dc 100644
--- a/docker/Dockerfile.afrouterd
+++ b/docker/Dockerfile.afrouterd
@@ -63,6 +63,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=afrouterd \
@@ -70,4 +71,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.ro_core b/docker/Dockerfile.ro_core
index 8f870bc..27dd34d 100644
--- a/docker/Dockerfile.ro_core
+++ b/docker/Dockerfile.ro_core
@@ -57,6 +57,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=voltha-ro-core \
@@ -64,4 +65,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.rw_core b/docker/Dockerfile.rw_core
index 11dedce..6bd4f89 100644
--- a/docker/Dockerfile.rw_core
+++ b/docker/Dockerfile.rw_core
@@ -57,6 +57,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=voltha-rw-core \
@@ -64,4 +65,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.simulated_olt b/docker/Dockerfile.simulated_olt
index 3475172..0a14ac9 100644
--- a/docker/Dockerfile.simulated_olt
+++ b/docker/Dockerfile.simulated_olt
@@ -58,6 +58,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=voltha-adapter-simulated-olt \
@@ -65,4 +66,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty
diff --git a/docker/Dockerfile.simulated_onu b/docker/Dockerfile.simulated_onu
index ce26973..b9d01cc 100644
--- a/docker/Dockerfile.simulated_onu
+++ b/docker/Dockerfile.simulated_onu
@@ -59,6 +59,7 @@
ARG org_label_schema_vcs_ref=unknown
ARG org_label_schema_build_date=unknown
ARG org_opencord_vcs_commit_date=unknown
+ARG org_opencord_vcs_dirty=unknown
LABEL org.label-schema.schema-version=1.0 \
org.label-schema.name=voltha-adapter-simulated-onu \
@@ -66,4 +67,5 @@
org.label-schema.vcs-url=$org_label_schema_vcs_url \
org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date
+ org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
+ org.opencord.vcs-dirty=$org_opencord_vcs_dirty