github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30040 from vishh/etcd-makefile

Browse Source 
Automatic merge from submit-queue

make etcd makefile work on OSX
This commit is contained in:
Kubernetes Submit Queue 2016-08-04 23:38:43 -07:00 committed by GitHub
commit 9189c2f72b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/images/etcd/Makefile
View File

@ -63,7 +63,7 @@ else
endif endif
# Replace BASEIMAGE with the real base image # 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 # And build the image
docker build -t $(REGISTRY)/etcd-$(ARCH):$(TAG) $(TEMP_DIR) docker build -t $(REGISTRY)/etcd-$(ARCH):$(TAG) $(TEMP_DIR)
@ -73,7 +73,7 @@ push: build
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # 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) gcloud docker push $(REGISTRY)/etcd:$(TAG)
endif endif