forked from kubernetes/kubernetes
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#25 from pbx0/coreos-hyperkube-v1.2.1
coreos hyperkube v1.2.1
- Loading branch information
Showing
5 changed files
with
112 additions
and
33 deletions.
There are no files selected for viewing
72 changes: 39 additions & 33 deletions
72
Godeps/_workspace/src/github.com/google/cadvisor/fs/fs.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
FROM debian:jessie | ||
|
||
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get -yy -q \ | ||
install \ | ||
iptables \ | ||
ethtool \ | ||
ca-certificates \ | ||
file \ | ||
util-linux \ | ||
socat \ | ||
curl \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \ | ||
&& DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
|
||
RUN cp /usr/bin/nsenter /nsenter | ||
|
||
COPY hyperkube /hyperkube | ||
RUN chmod a+rx /hyperkube | ||
|
||
RUN ln -s /hyperkube /kubelet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
KUBERNETES_VERSION = $(shell ./kubernetes-version.sh) | ||
|
||
# Convert + to - for docker tag compatibility | ||
IMAGE_VERSION = $(subst +,_,$(KUBERNETES_VERSION)) | ||
|
||
TAG = quay.io/coreos/hyperkube:$(IMAGE_VERSION) | ||
HYPERKUBE = ../_output/dockerized/bin/linux/amd64/hyperkube | ||
|
||
.PHONY: all container push clean | ||
|
||
all: container | ||
|
||
container: Dockerfile $(HYPERKUBE) | ||
$(eval TEMPDIR := $(shell mktemp -d -t $(KUBERNETES_VERSION).XXXX)) | ||
cp $^ $(TEMPDIR) | ||
docker build -t $(TAG) $(TEMPDIR) | ||
rm -rf $(TEMPDIR) | ||
|
||
push: | ||
docker push $(TAG) | ||
|
||
$(HYPERKUBE): | ||
make -C .. release | ||
|
||
clean: | ||
make -C .. clean | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Development | ||
|
||
``` | ||
make clean | ||
make container TAG=quay.io/foo/bar:v0.0.0 | ||
make push TAG=quay.io/foo/bar:v0.0.0 | ||
``` | ||
|
||
# Release | ||
|
||
1. Tag version (e.g. `v1.1.x+coreos.0`) | ||
1. Create pull-request & merge | ||
1. Build & push image | ||
|
||
``` | ||
make clean | ||
make container | ||
make push | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
#!/bin/bash | ||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. | ||
source ${KUBE_ROOT}/hack/lib/version.sh | ||
kube::version::get_version_vars | ||
echo "${KUBE_GIT_VERSION}" |