kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #161 from aaron-prindle/docker_version 

Updated Dockerfile to get docker version 1.11.1 for the iso file, als…
pull/174/head
dlorenc 2016-06-06 10:42:15 -07:00
parent 70f78e12f6 eee920bae4
commit fd44bd0c47
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/iso/Dockerfile
View File

@ -17,8 +17,8 @@
FROM boot2docker/boot2docker
# Set the version of Docker and the expected sha.
RUN echo "1.9.1" > $ROOTFS/etc/version
ENV DOCKER_SHA 8824f8a67fbe55d1e52dcbebc74219ba8090006e
RUN echo "1.11.1" > $ROOTFS/etc/version
ENV DOCKER_SHA b7d6025beb6440341741ea9324655a267fba83f7
# Add other dependencies here to $ROOTFS/
ADD nsenter $ROOTFS/usr/bin/
@ -39,7 +39,7 @@ RUN rm -f /$ROOTFS/usr/local/bin/docker*
RUN curl -fSL -o /tmp/dockerbin.tgz https://get.docker.com/builds/Linux/x86_64/docker-$(cat $ROOTFS/etc/version).tgz && \
# Check the sha1 matches.
if [ $DOCKER_SHA != $(sha1sum /tmp/dockerbin.tgz | cut -f1 -d ' ') ]; then echo "SHA mismatch!"; exit 1; fi && \
tar -zxvf /tmp/dockerbin.tgz -C "$ROOTFS/usr/local/bin" --strip-components=3 && \
tar -zxvf /tmp/dockerbin.tgz -C "$ROOTFS/usr/local/bin" --strip-components=1 && \
rm /tmp/dockerbin.tgz
RUN $ROOTFS/usr/local/bin/docker -v

6
deploy/iso/README.md
View File

@ -8,9 +8,9 @@ To manually try out the built iso, you can run the following commands to create
```shell
VBoxManage createvm --name testminikube --ostype "Linux_64" --register
VBoxManage storagectl foo --name "IDE Controller" --add ide
VBoxManage storageattach foo --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium ./minikube.iso
VBoxManage modifyvm foo --memory 1024 --vrde on --vrdeaddress 127.0.0.1 --vrdeport 3390 --vrdeauthtype null
VBoxManage storagectl testminikube --name "IDE Controller" --add ide
VBoxManage storageattach testminikube --storagectl "IDE Controller" --port 0 --device 0 --type dvddrive --medium ./minikube.iso
VBoxManage modifyvm testminikube --memory 1024 --vrde on --vrdeaddress 127.0.0.1 --vrdeport 3390 --vrdeauthtype null
```
Then use the VirtualBox gui to start and open a session.

2
pkg/minikube/constants/constants.go
View File

@ -45,7 +45,7 @@ var LogFlags = [...]string{
"vmodule",
}
const DefaultIsoUrl = "https://storage.googleapis.com/minikube/minikube-0.2.iso"
const DefaultIsoUrl = "https://storage.googleapis.com/minikube/minikube-0.3.iso"
const (
RemoteLocalKubeErrPath = "/var/log/localkube.err"