github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 12:41:58 +00:00
Code Issues Projects Releases Wiki Activity

Revert k8s.gcr.io vanity domain

Browse Source 
This reverts commit eba5b6092a.

Fixes https://github.com/kubernetes/kubernetes/issues/57526
This commit is contained in:
Tim Hockin
2017-12-22 14:36:16 -08:00
parent 475d5c32e8
commit e9dd8a68f6
233 changed files with 470 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/debian-hyperkube-base/Makefile
View File

@@ -15,15 +15,15 @@
# Build the hyperkube base image. This image is used to build the hyperkube image.
#
# Usage:
# [ARCH=amd64] [REGISTRY="k8s.gcr.io"] make (build|push)
# [ARCH=amd64] [REGISTRY="gcr.io/google-containers"] make (build|push)
REGISTRY?=k8s.gcr.io
REGISTRY?=gcr.io/google-containers
IMAGE?=debian-hyperkube-base
TAG=0.8
ARCH?=amd64
CACHEBUST?=1
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3
BASEIMAGE=gcr.io/google-containers/debian-base-$(ARCH):0.3
CNI_VERSION=v0.6.0
TEMP_DIR:=$(shell mktemp -d)

12
build/debian-hyperkube-base/README.md
View File

@@ -1,6 +1,6 @@
### debian-hyperkube-base
Serves as the base image for `k8s.gcr.io/hyperkube-${ARCH}`
Serves as the base image for `gcr.io/google-containers/hyperkube-${ARCH}`
images.
This image is compiled for multiple architectures.
@@ -12,19 +12,19 @@ If you're editing the Dockerfile or some other thing, please bump the `TAG` in t
```console
# Build for linux/amd64 (default)
$ make push ARCH=amd64
# ---> k8s.gcr.io/debian-hyperkube-base-amd64:TAG
# ---> gcr.io/google-containers/debian-hyperkube-base-amd64:TAG
$ make push ARCH=arm
# ---> k8s.gcr.io/debian-hyperkube-base-arm:TAG
# ---> gcr.io/google-containers/debian-hyperkube-base-arm:TAG
$ make push ARCH=arm64
# ---> k8s.gcr.io/debian-hyperkube-base-arm64:TAG
# ---> gcr.io/google-containers/debian-hyperkube-base-arm64:TAG
$ make push ARCH=ppc64le
# ---> k8s.gcr.io/debian-hyperkube-base-ppc64le:TAG
# ---> gcr.io/google-containers/debian-hyperkube-base-ppc64le:TAG
$ make push ARCH=s390x
# ---> k8s.gcr.io/debian-hyperkube-base-s390x:TAG
# ---> gcr.io/google-containers/debian-hyperkube-base-s390x:TAG
```
If you don't want to push the images, run `make build` instead