github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33556 from wojtek-t/build_etcd_image

Browse Source 
Automatic merge from submit-queue

Allow building experimenta etcd images

Ref #20504

Once this PR is in, I would like to build and push: "etcd:3.0.10-experimental" image to:
- start testing it
- to make it possible to build a different "3.0.10" image in the future (we will most probably built in some loging into it.

@lavalamp - FYI
This commit is contained in:
Kubernetes Submit Queue 2016-09-28 03:39:29 -07:00 committed by GitHub
commit 05b7ee2bee
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/images/etcd/Makefile
View File

@ -18,6 +18,7 @@
# [TAG=3.0.4] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push) # [TAG=3.0.4] [REGISTRY=gcr.io/google_containers] [ARCH=amd64] [BASEIMAGE=busybox] make (build|push)
TAG?=3.0.4 TAG?=3.0.4
REGISTRY_TAG?=$(TAG)
ARCH?=amd64 ARCH?=amd64
REGISTRY?=gcr.io/google_containers REGISTRY?=gcr.io/google_containers
GOLANG_VERSION?=1.6.3 GOLANG_VERSION?=1.6.3
@ -71,15 +72,15 @@ endif
cd $(TEMP_DIR) && sed -i.bak '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):$(REGISTRY_TAG) $(TEMP_DIR)
push: build push: build
gcloud docker push $(REGISTRY)/etcd-$(ARCH):$(TAG) gcloud docker push $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG)
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
# Backward compatibility. TODO: deprecate this image tag # Backward compatibility. TODO: deprecate this image tag
docker tag $(REGISTRY)/etcd-$(ARCH):$(TAG) $(REGISTRY)/etcd:$(TAG) docker tag $(REGISTRY)/etcd-$(ARCH):$(REGISTRY_TAG) $(REGISTRY)/etcd:$(REGISTRY_TAG)
gcloud docker push $(REGISTRY)/etcd:$(TAG) gcloud docker push $(REGISTRY)/etcd:$(REGISTRY_TAG)
endif endif
all: build all: build