docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-08-12 20:42:00 -07:00
parent e8c3a5eba9 5cd30d7e62
commit afd8faf54a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osx/Dockerfile
View File

@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
# Download the Docker parts # Download the Docker parts
ENV DOCKER_VERSION 1.8.0 ENV DOCKER_VERSION 1.8.1
RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
RUN chmod +x /docker RUN chmod +x /docker
@ -41,10 +41,10 @@ RUN chmod +x /docker-compose
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso
ENV KITEMATIC_VERSION 0.8.1 ENV KITEMATIC_VERSION 0.8.2
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip
ENV INSTALLER_VERSION 1.8.0b ENV INSTALLER_VERSION 1.8.1
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

6
osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall
View File

@ -18,7 +18,11 @@ VM=default
VBOXMANAGE=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage VBOXMANAGE=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage
if [ -f $VBOXMANAGE ] && [ -f /usr/local/bin/docker-machine ]; then # Make sure this version of boot2docker can migrate
/usr/local/bin/docker-machine create --help | grep virtualbox-import-boot2docker-vm
DOCKER_MACHINE_MIGRATION_CHECK=$?
if [ -f $VBOXMANAGE ] && [ -f /usr/local/bin/docker-machine ] && [ $DOCKER_MACHINE_MIGRATION_CHECK -eq 0 ]; then
sudo -u $USER $VBOXMANAGE showvminfo $BOOT2DOCKER_VM &> /dev/null sudo -u $USER $VBOXMANAGE showvminfo $BOOT2DOCKER_VM &> /dev/null
BOOT2DOCKER_VM_EXISTS_CODE=$? BOOT2DOCKER_VM_EXISTS_CODE=$?