From d2915f1267ad7c743a19a159fd0c9deefa2203c6 Mon Sep 17 00:00:00 2001
From: Vishnu Kannan <vishnuk@google.com>
Date: Wed, 3 Aug 2016 17:25:11 -0700
Subject: [PATCH] make etcd makefile work on OSX

Signed-off-by: Vishnu Kannan <vishnuk@google.com>
---
 cluster/images/etcd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile
index 9325e691acc..3844e518961 100644
--- a/cluster/images/etcd/Makefile
+++ b/cluster/images/etcd/Makefile
@@ -63,7 +63,7 @@ else
 endif
 
 	# Replace BASEIMAGE with the real base image
-	cd $(TEMP_DIR) && sed -i "s|BASEIMAGE|$(BASEIMAGE)|g" Dockerfile
+	cd $(TEMP_DIR) && sed -i.bak 's|BASEIMAGE|$(BASEIMAGE)|g' Dockerfile
 
 	# And build the image
 	docker build -t $(REGISTRY)/etcd-$(ARCH):$(TAG) $(TEMP_DIR)
@@ -73,7 +73,7 @@ push: build
 
 ifeq ($(ARCH),amd64)
 	# Backward compatibility. TODO: deprecate this image tag
-	docker tag -f $(REGISTRY)/etcd-$(ARCH):$(TAG) $(REGISTRY)/etcd:$(TAG)
+	docker tag $(REGISTRY)/etcd-$(ARCH):$(TAG) $(REGISTRY)/etcd:$(TAG)
 	gcloud docker push $(REGISTRY)/etcd:$(TAG)
 endif