From eee920bae4e1571c0b12b252638972085fcbc743 Mon Sep 17 00:00:00 2001 From: aprindle Date: Fri, 3 Jun 2016 09:00:57 -0700 Subject: [PATCH] Updated Dockerfile to get docker version 1.11.1 for the iso file Updated README for iso testing Updated DefaultIsoUrl to minikube-0.3 --- deploy/iso/Dockerfile | 6 +++--- deploy/iso/README.md | 6 +++--- pkg/minikube/constants/constants.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/iso/Dockerfile b/deploy/iso/Dockerfile index 36ee9c4084..9145994803 100644 --- a/deploy/iso/Dockerfile +++ b/deploy/iso/Dockerfile @@ -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 diff --git a/deploy/iso/README.md b/deploy/iso/README.md index 4e87cca7fa..c8b30129b6 100644 --- a/deploy/iso/README.md +++ b/deploy/iso/README.md @@ -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. diff --git a/pkg/minikube/constants/constants.go b/pkg/minikube/constants/constants.go index 6842347cd2..cf7f5c96a2 100644 --- a/pkg/minikube/constants/constants.go +++ b/pkg/minikube/constants/constants.go @@ -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"