From ef538906eaca18de86adb4575ddb5f4842d51f2f Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Mon, 7 Mar 2016 15:05:10 -0800
Subject: [PATCH] Fix TAG value

---
 expandybird/Makefile  | 3 ++-
 include.mk            | 3 ++-
 manager/Makefile      | 3 ++-
 resourcifier/Makefile | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/expandybird/Makefile b/expandybird/Makefile
index 16f0c7882..c1c26c08e 100644
--- a/expandybird/Makefile
+++ b/expandybird/Makefile
@@ -31,7 +31,8 @@ else
 endif
 
 container:
-	docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR)
+	docker build -t $(PREFIX)/$(IMAGE):latest -f Dockerfile $(DIR)
+	docker tag -f $(PREFIX)/$(IMAGE):latest $(PREFIX)/$(IMAGE):$(TAG)
 
 clean:
 	-docker rmi $(PREFIX)/$(IMAGE):$(TAG)
diff --git a/include.mk b/include.mk
index fca436983..36c1e1df6 100644
--- a/include.mk
+++ b/include.mk
@@ -5,7 +5,8 @@ info:
 	@echo "Project: ${PROJECT}"
 	@echo "Image: ${IMAGE}"
 
-TAG ?= $(shell echo `date +"%s"`_`date +"%N"`)
+DEFAULT_TAG := git-$(shell git rev-parse --short HEAD)
+TAG ?= ${DEFAULT_TAG}
 
 .PHONY: test-unit
 test-unit:
diff --git a/manager/Makefile b/manager/Makefile
index 209c874f2..325e82a08 100644
--- a/manager/Makefile
+++ b/manager/Makefile
@@ -31,7 +31,8 @@ else
 endif
 
 container:
-	docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR)
+	docker build -t $(PREFIX)/$(IMAGE):latest -f Dockerfile $(DIR)
+	docker tag -f $(PREFIX)/$(IMAGE):latest $(PREFIX)/$(IMAGE):$(TAG)
 
 clean:
 	-docker rmi $(PREFIX)/$(IMAGE):$(TAG)
diff --git a/resourcifier/Makefile b/resourcifier/Makefile
index 9d6eebe1a..e3cdd410c 100644
--- a/resourcifier/Makefile
+++ b/resourcifier/Makefile
@@ -33,7 +33,8 @@ else
 endif
 
 container:
-	docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR)
+	docker build -t $(PREFIX)/$(IMAGE):latest -f Dockerfile $(DIR)
+	docker tag -f $(PREFIX)/$(IMAGE):latest $(PREFIX)/$(IMAGE):$(TAG)
 
 clean:
 	-docker rmi $(PREFIX)/$(IMAGE):$(TAG)