github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19165 from fgrzadkowski/release_docker_hyperkube

Browse Source 
Refactor hyperkube Makefile to avoid changing local files
This commit is contained in:
Marek Grabowski 2015-12-29 12:07:44 +01:00
commit 9a1d16f47d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster/images/hyperkube/Makefile
View File

@ -3,6 +3,7 @@
VERSION=v1.1.2 VERSION=v1.1.2
ARCH=amd64 ARCH=amd64
BASEIMAGE=debian:jessie BASEIMAGE=debian:jessie
TEMP_DIR:=$(shell mktemp -d)
## Comment in for arm builds, must be run on an arm machine ## Comment in for arm builds, must be run on an arm machine
# ARCH=arm # ARCH=arm
@ -12,13 +13,14 @@ BASEIMAGE=debian:jessie
all: build all: build
build: build:
cp ../../saltbase/salt/helpers/safe_format_and_mount . cp ./* ${TEMP_DIR}
cp ../../saltbase/salt/generate-cert/make-ca-cert.sh . cp ../../saltbase/salt/helpers/safe_format_and_mount ${TEMP_DIR}
curl -O https://storage.googleapis.com/kubernetes-release/release/${VERSION}/bin/linux/${ARCH}/hyperkube cp ../../saltbase/salt/generate-cert/make-ca-cert.sh ${TEMP_DIR}
sed -i "s/VERSION/${VERSION}/g" master-multi.json master.json kube-proxy.json cp ../../../_output/dockerized/bin/linux/${ARCH}/hyperkube ${TEMP_DIR}
sed -i "s/ARCH/${ARCH}/g" master-multi.json master.json kube-proxy.json cd ${TEMP_DIR} && sed -i "s/VERSION/${VERSION}/g" master-multi.json master.json kube-proxy.json
sed -i "s/BASEIMAGE/${BASEIMAGE}/g" Dockerfile cd ${TEMP_DIR} && sed -i "s/ARCH/${ARCH}/g" master-multi.json master.json kube-proxy.json
docker build -t gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} . cd ${TEMP_DIR} && sed -i "s/BASEIMAGE/${BASEIMAGE}/g" Dockerfile
docker build -t gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR}
# Backward compatability. TODO: deprecate this image tag # Backward compatability. TODO: deprecate this image tag
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
docker tag -f gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} gcr.io/google_containers/hyperkube:${VERSION} docker tag -f gcr.io/google_containers/hyperkube-${ARCH}:${VERSION} gcr.io/google_containers/hyperkube:${VERSION}