f2959ab2b0
* Adjust hyperkube Makefile to allow HYPERKUBE_BIN to be
specified from outside
* new DOCKER_ROOT variable to specify --root-dir and associated
volume for kubelet to know where docker directory lives
* Save the docker logs when we kill the kubelet container
* Allow customized image for dockerized kubelet and build a Default
image if one is not specified
We should allow a custom build using script we have:
`VERSION="latest" REGISTRY="k8s.gcr.io" hack/dev-push-hyperkube.sh`
to be used quickly using DOCKERIZE_KUBELET. To do this we remove the
hard coded `k8s.gcr.io/kubelet` image and introduce a new environment
variable `KUBELET_IMAGE`.
Note that we are switching to hyperkube from kubelet as we have a quick
and easy script to build hyperkube image and load it into local docker
daemon. This reduces bad hacks like `docker tag
k8s.gcr.io/hyperkube-amd64:<tag> k8s.gcr.io/kubelet:latest` being used
by folks today (see 62057)
* Better cope with PID 0 when running "docker inspect" to look for
the process id for kubelet container
56 lines
1.8 KiB
Makefile
56 lines
1.8 KiB
Makefile
# Copyright 2016 The Kubernetes Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
# Build the hyperkube image.
|
|
#
|
|
# Usage:
|
|
# [ARCH=amd64] [REGISTRY="staging-k8s.gcr.io"] make (build|push) VERSION={some_released_version_of_kubernetes}
|
|
|
|
REGISTRY?=staging-k8s.gcr.io
|
|
ARCH?=amd64
|
|
OUT_DIR?=_output
|
|
HYPERKUBE_BIN?=$(shell pwd)/../../../$(OUT_DIR)/dockerized/bin/linux/$(ARCH)/hyperkube
|
|
|
|
BASEIMAGE=k8s.gcr.io/debian-hyperkube-base-$(ARCH):0.10
|
|
TEMP_DIR:=$(shell mktemp -d -t hyperkubeXXXXXX)
|
|
|
|
all: build
|
|
|
|
build:
|
|
|
|
ifndef VERSION
|
|
$(error VERSION is undefined)
|
|
endif
|
|
cp -r ./* ${TEMP_DIR}
|
|
cp ${HYPERKUBE_BIN} ${TEMP_DIR}
|
|
|
|
chmod a+rx ${TEMP_DIR}/hyperkube
|
|
|
|
cd ${TEMP_DIR} && sed -i.back "s|BASEIMAGE|${BASEIMAGE}|g" Dockerfile
|
|
|
|
# Register /usr/bin/qemu-ARCH-static as the handler for non-x86 binaries in the kernel
|
|
docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
|
docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
|
|
rm -rf "${TEMP_DIR}"
|
|
|
|
push: build
|
|
docker push ${REGISTRY}/hyperkube-${ARCH}:${VERSION}
|
|
ifeq ($(ARCH),amd64)
|
|
docker rmi ${REGISTRY}/hyperkube:${VERSION} 2>/dev/null || true
|
|
docker tag ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${REGISTRY}/hyperkube:${VERSION}
|
|
docker push ${REGISTRY}/hyperkube:${VERSION}
|
|
endif
|
|
|
|
.PHONY: build push all
|