commit 08a8e86013eeac1bd10259dbb38ca2f42db557cc
author Matt Jeanneret <mj3580@att.com> Fri Dec 20 14:02:32 2019 -0500
committer Matt Jeanneret <mj3580@att.com> Mon Jan 20 06:18:12 2020 -0500
tree d356fc583aa0324a7a8a041d39687a0e000e1a35
parent cac5695627188fe1abbc0699561367d5e86f6294

VOL-2311: Better logging and remove old code

- tasks have better detail
- 1.x functions removed
- extraineous logging removed
- build info injected into environment, viewable
  in log and voltctl similar to openolt

Change-Id: I9b22334c3049efa857b485cca28a343b36514ab6

python/Makefile

diff --git a/python/Makefile b/python/Makefile
index fe529a0..ee23590 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -20,6 +20,10 @@
 # Variables
 VERSION                  ?= $(shell cat ../VERSION)
 
+DOCKER_LABEL_VCS_DIRTY     = false
+ifneq ($(shell git ls-files --others --modified --exclude-standard 2>/dev/null | wc -l | sed -e 's/ //g'),0)
+    DOCKER_LABEL_VCS_DIRTY = true
+endif
 ## Docker related
 DOCKER_REGISTRY          ?=
 DOCKER_REPOSITORY        ?=
@@ -29,15 +33,10 @@
 TYPE                     ?= minimal
 
 ## Docker labels. Only set ref and commit date if committed
-DOCKER_LABEL_VCS_URL     ?= $(shell git remote get-url $(shell git remote))
-DOCKER_LABEL_BUILD_DATE  ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
-DOCKER_LABEL_COMMIT_DATE = $(shell git show -s --format=%cd --date=iso-strict HEAD)
-
-ifeq ($(shell git ls-files --others --modified --exclude-standard 2>/dev/null | wc -l | sed -e 's/ //g'),0)
-  DOCKER_LABEL_VCS_REF = $(shell git rev-parse HEAD)
-else
-  DOCKER_LABEL_VCS_REF = $(shell git rev-parse HEAD)+dirty
-endif
+DOCKER_LABEL_VCS_URL       ?= $(shell git remote get-url $(shell git remote))
+DOCKER_LABEL_VCS_REF       = $(shell git rev-parse HEAD)
+DOCKER_LABEL_BUILD_DATE    ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
+DOCKER_LABEL_COMMIT_DATE   = $(shell git show -s --format=%cd --date=iso-strict HEAD)
 
 .PHONY: venv docker-build local-protos local-pyvoltha
 
@@ -86,6 +85,7 @@
     --build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
     --build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
     --build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
+    --build-arg org_opencord_vcs_dirty="${DOCKER_LABEL_VCS_DIRTY}" \
     -f docker/Dockerfile.openonu_adapter .
 
 docker-push: