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

Fix dockerfile for etcd.2.0.0

Browse Source
This commit is contained in:
Salvatore Dario Minonne 2015-01-30 15:27:41 +01:00
parent 55793ac206
commit 9a0e16a009
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/build-image/Dockerfile
View File

@ -33,9 +33,9 @@ RUN apt-get update && apt-get install -y rsync
# Download and symlink etcd. We need this for our integration tests. # Download and symlink etcd. We need this for our integration tests.
RUN mkdir -p /usr/local/src/etcd &&\ RUN mkdir -p /usr/local/src/etcd &&\
cd /usr/local/src/etcd &&\ cd /usr/local/src/etcd &&\
curl -L -O -s https://github.com/coreos/etcd/releases/download/v0.4.6/etcd-v0.4.6-linux-amd64.tar.gz &&\ curl -L -O -s https://github.com/coreos/etcd/releases/download/v2.0.0/etcd-v2.0.0-linux-amd64.tar.gz &&\
tar xzf etcd-v0.4.6-linux-amd64.tar.gz &&\ tar xzf etcd-v2.0.0-linux-amd64.tar.gz &&\
ln -s ../src/etcd/etcd-v0.4.6-linux-amd64/etcd /usr/local/bin/ ln -s ../src/etcd/etcd-v2.0.0-linux-amd64/etcd /usr/local/bin/
# Mark this as a kube-build container # Mark this as a kube-build container
RUN touch /kube-build-image RUN touch /kube-build-image

3
docs/devel/development.md
View File

@ -136,7 +136,7 @@ godep go tool cover -html=target/c.out
## Integration tests ## Integration tests
You need an [etcd](https://github.com/coreos/etcd/releases/tag/v0.4.6) in your path, please make sure it is installed and in your ``$PATH``. You need an [etcd](https://github.com/coreos/etcd/releases/tag/v2.0.0) in your path, please make sure it is installed and in your ``$PATH``.
``` ```
cd kubernetes cd kubernetes
hack/test-integration.sh hack/test-integration.sh
@ -243,4 +243,3 @@ git rebase upstream/master
``` ```
hack/run-gendocs.sh hack/run-gendocs.sh
``` ```