From f1a4b65bcbad1e37d7ab53363ce8e2bd5055f272 Mon Sep 17 00:00:00 2001
From: Kalimuthu Velappan <kalimuthu.velappan@broadcom.com>
Date: Tue, 12 Jan 2021 07:58:11 -0800
Subject: [PATCH] Review comments updated

---
 Makefile.work |  4 ++--
 slave.mk      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile.work b/Makefile.work
index 2309075da056..9c66264fa792 100644
--- a/Makefile.work
+++ b/Makefile.work
@@ -167,7 +167,7 @@ endif
 
 # User name and tag for "docker-*" images created by native dockerd mode.
 ifeq ($(strip $(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD)),y)
-DOCKER_USERNAME = -$(shell echo $(USER) | tr '[:upper:]' '[:lower:]')
+DOCKER_USERNAME = -$(USER_LC)
 DOCKER_USERTAG = $(SLAVE_TAG)
 else
 DOCKER_USERNAME =
@@ -277,7 +277,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            SONIC_DPKG_CACHE_SOURCE=$(SONIC_DPKG_CACHE_SOURCE) \
                            HTTP_PROXY=$(http_proxy) \
                            HTTPS_PROXY=$(https_proxy) \
-                           DOCKER_USERNAME=$(DOCKER_USERNAME) \
+                           USER_LC=$(USER_LC) \
                            DOCKER_USERTAG=$(DOCKER_USERTAG) \
                            DOCKER_LOCKDIR=$(DOCKER_LOCKDIR) \
                            DOCKER_LOCKFILE_SAVE=$(DOCKER_LOCKFILE_SAVE) \
diff --git a/slave.mk b/slave.mk
index 04c1bcded7a4..10fe9b47c4d5 100644
--- a/slave.mk
+++ b/slave.mk
@@ -183,9 +183,9 @@ override SONIC_BUILD_JOBS := $(SONIC_CONFIG_BUILD_JOBS)
 endif
 
 ifeq ($(strip $(SONIC_CONFIG_USE_NATIVE_DOCKERD_FOR_BUILD)),y)
-DOCKER_IMAGE_REF = $*$(DOCKER_USERNAME):$(DOCKER_USERTAG)
-DOCKER_DBG_IMAGE_REF = $*-$(DBG_IMAGE_MARK)$(DOCKER_USERNAME):$(DOCKER_USERTAG)
-docker-load-image-get = $(if $(1),$(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG))
+DOCKER_IMAGE_REF = $*$(USER_LC):$(DOCKER_USERTAG)
+DOCKER_DBG_IMAGE_REF = $*-$(DBG_IMAGE_MARK)$(USER_LC):$(DOCKER_USERTAG)
+docker-load-image-get = $(if $(1),$(1)$(USER_LC):$(DOCKER_USERTAG))
 else
 DOCKER_IMAGE_REF = $*
 DOCKER_DBG_IMAGE_REF = $*-$(DBG_IMAGE_MARK)
@@ -310,16 +310,16 @@ define docker-image-save
     @echo "Attempting docker image lock for $(1) save" $(LOG)
     $(call MOD_LOCK,$(1),$(DOCKER_LOCKDIR),$(DOCKER_LOCKFILE_SUFFIX),$(DOCKER_LOCKFILE_TIMEOUT))
     @echo "Obtained docker image lock for $(1) save" $(LOG)
-    @echo "Tagging docker image $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG) as $(1):latest" $(LOG)
-    docker tag $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(1):latest $(LOG)
+    @echo "Tagging docker image $(1)$(USER_LC):$(DOCKER_USERTAG) as $(1):latest" $(LOG)
+    docker tag $(1)$(USER_LC):$(DOCKER_USERTAG) $(1):latest $(LOG)
     @echo "Saving docker image $(1):latest" $(LOG)
         docker save $(1):latest | gzip -c > $(2)
     @echo "Removing docker image $(1):latest" $(LOG)
     docker rmi -f $(1):latest $(LOG)
     $(call MOD_UNLOCK,$(1))
     @echo "Released docker image lock for $(1) save" $(LOG)
-    @echo "Removing docker image $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG)
-    docker rmi -f $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG)
+    @echo "Removing docker image $(1)$(USER_LC):$(DOCKER_USERTAG)" $(LOG)
+    docker rmi -f $(1)$(USER_LC):$(DOCKER_USERTAG) $(LOG)
 endef
 
 # $(call docker-image-load,from)
@@ -335,8 +335,8 @@ define docker-image-load
     @echo "Obtained docker image lock for $(1) load" $(LOG)
     @echo "Loading docker image $(TARGET_PATH)/$(1).gz" $(LOG)
     docker load -i $(TARGET_PATH)/$(1).gz $(LOG)
-    @echo "Tagging docker image $(1):latest as $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG)" $(LOG)
-    docker tag $(1):latest $(1)$(DOCKER_USERNAME):$(DOCKER_USERTAG) $(LOG)
+    @echo "Tagging docker image $(1):latest as $(1)$(USER_LC):$(DOCKER_USERTAG)" $(LOG)
+    docker tag $(1):latest $(1)$(USER_LC):$(DOCKER_USERTAG) $(LOG)
     @echo "Removing docker image $(1):latest" $(LOG)
     docker rmi -f $(1):latest $(LOG)
     $(call MOD_UNLOCK,$(1))