Merge df5b618560 into c3ee20302f

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)

get-install.sh

@@ -15,7 +15,7 @@
 
 set -euo pipefail
 
-DEFAULT_TAG=v1.2
+DEFAULT_TAG=v1.2.1
 DEFAULT_BINARY=${GOPATH}/bin/dm
 DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
 DEFAULT_ARCH=$(uname -m)

hack/dm-push.sh

@@ -21,7 +21,7 @@
 
 set -euo pipefail
 
-DEFAULT_TAG=v1.2
+DEFAULT_TAG=v1.2.1
 DEFAULT_BINARY=${GOPATH}/bin/dm
 DEFAULT_PLATFORM=$(uname | tr '[:upper:]' '[:lower:]')
 DEFAULT_ARCH=$(uname -m)

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:

install.yaml

@@ -58,7 +58,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: gcr.io/dm-k8s-prod/expandybird:v1.2
+        image: gcr.io/dm-k8s-prod/expandybird:v1.2.1
         name: expandybird
         ports:
         - containerPort: 8080
@@ -102,7 +102,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: gcr.io/dm-k8s-prod/resourcifier:v1.2
+        image: gcr.io/dm-k8s-prod/resourcifier:v1.2.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -153,7 +153,7 @@ spec:
     spec:
       containers:
       - env: []
-        image: gcr.io/dm-k8s-prod/manager:v1.2
+        image: gcr.io/dm-k8s-prod/manager:v1.2.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

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)

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)