Skip to content

Commit

Permalink
Merge pull request kubernetes#25 from pbx0/coreos-hyperkube-v1.2.1
Browse files Browse the repository at this point in the history
coreos hyperkube v1.2.1
  • Loading branch information
Patrick Baxter committed Apr 7, 2016
2 parents 5080910 + 8e9b6df commit 549bc33
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 33 deletions.
72 changes: 39 additions & 33 deletions 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.

22 changes: 22 additions & 0 deletions coreos/Dockerfile
@@ -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
27 changes: 27 additions & 0 deletions coreos/Makefile
@@ -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

19 changes: 19 additions & 0 deletions coreos/README.md
@@ -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
```
5 changes: 5 additions & 0 deletions coreos/kubernetes-version.sh
@@ -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}"

0 comments on commit 549bc33

Please sign in to comment.