mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #30040 from vishh/etcd-makefile
Automatic merge from submit-queue make etcd makefile work on OSX
This commit is contained in:
commit
9189c2f72b
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user