From be5f0dee61d9d4cd0274dc425e736dacd796b669 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 13 Jul 2015 17:45:33 -0700 Subject: [PATCH 01/14] Fix version name ENV Fix version name ENV --- .gitignore | 2 +- osx/Dockerfile | 14 +++++++++----- osx/mpkg/Resources/en.lproj/Localizable.strings | 11 +++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 35b8b40d5e..82ae9eeae3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -DockerToolbox.pkg +DockerToolbox*.pkg windows/Output/** windows/bundle/** site/public diff --git a/osx/Dockerfile b/osx/Dockerfile index b3b7a727e5..70aab23b78 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -80,8 +80,6 @@ RUN cd /mpkg/docker.pkg && \ -e "s/%DOCKER_NUMBER_OF_FILES%/`find . | wc -l`/g" \ -e "s/%DOCKER_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ -e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \ - -e "s/%DOCKER_MACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \ - -e "s/%DOCKER_COMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \ ../PackageInfo /mpkg/Distribution && \ cd .. && \ rm -rf ./rootfs @@ -98,7 +96,7 @@ RUN cd /mpkg/dockermachine.pkg && \ sed -i \ -e "s/%DOCKERMACHINE_NUMBER_OF_FILES%/`find . | wc -l`/g" \ -e "s/%DOCKERMACHINE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ - -e "s/%DOCKERMACHINE_VERSION%/$DOCKER_VERSION/g" \ + -e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \ ../PackageInfo /mpkg/Distribution && \ cd .. && \ rm -rf ./rootfs @@ -115,7 +113,7 @@ RUN cd /mpkg/dockercompose.pkg && \ sed -i \ -e "s/%DOCKERCOMPOSE_NUMBER_OF_FILES%/`find . | wc -l`/g" \ -e "s/%DOCKERCOMPOSE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ - -e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_VERSION/g" \ + -e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \ ../PackageInfo /mpkg/Distribution && \ cd .. && \ rm -rf ./rootfs @@ -161,7 +159,7 @@ RUN cd /mpkg/kitematicapp.pkg && \ sed -i \ -e "s/%KITEMATICAPP_NUMBER_OF_FILES%/`find . | wc -l`/g" \ -e "s/%KITEMATICAPP_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ - -e "s/%KITEMATICAPP_VERSION%/$INSTALLER_VERSION/g" \ + -e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \ ../PackageInfo /mpkg/Distribution && \ cd .. && \ rm -rf ./rootfs @@ -180,6 +178,12 @@ RUN sed -i \ /mpkg/Distribution && \ sed -i \ -e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \ + -e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \ + -e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \ + -e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \ + -e "s/%BOOT2DOCKER_ISO_VERSION%/$BOOT2DOCKER_ISO_VERSION/g" \ + -e "s/%DOCKERCLIAPP_VERSION%/$INSTALLER_VERSION/g" \ + -e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \ mpkg/Resources/en.lproj/Localizable.strings # Make DMG rootfs diff --git a/osx/mpkg/Resources/en.lproj/Localizable.strings b/osx/mpkg/Resources/en.lproj/Localizable.strings index 50cddd577c..53c7add865 100644 --- a/osx/mpkg/Resources/en.lproj/Localizable.strings +++ b/osx/mpkg/Resources/en.lproj/Localizable.strings @@ -1,21 +1,21 @@ 'docker_title' = 'Docker Toolbox'; -'choiceDockerCLI_title' = 'Docker'; +'choiceDockerCLI_title' = 'Docker Client %DOCKER_VERSION%'; 'choiceDockerCLI_msg' = 'Installs the Docker client for Mac OS X into /usr/local/bin/'; -'choiceDockerMachineCLI_title' = 'Docker Machine'; +'choiceDockerMachineCLI_title' = 'Docker Machine %DOCKERMACHINE_VERSION%'; 'choiceDockerMachineCLI_msg' = 'Installs the Docker Machine binary into /usr/local/bin/'; -'choiceDockerComposeCLI_title' = 'Docker Compose'; +'choiceDockerComposeCLI_title' = 'Docker Compose %DOCKERCOMPOSE_VERSION%'; 'choiceDockerComposeCLI_msg' = 'Installs the Docker Compose binary into /usr/local/bin/'; -'choiceBoot2DockerISO_title' = 'Boot2Docker ISO'; +'choiceBoot2DockerISO_title' = 'Boot2Docker ISO %BOOT2DOCKER_ISO_VERSION%'; 'choiceBoot2DockerISO_msg' = 'Installs the boot2docker.iso into /usr/local/share/'; 'choiceDockerCLIAPP_title' = 'Docker CLI Quick-start applet'; 'choiceDockerCLIAPP_msg' = 'Installs the Docker CLI Quick-start applet into /Applications/'; -'choiceKitematicAPP_title' = 'Kitematic'; +'choiceKitematicAPP_title' = 'Kitematic %KITEMATICAPP_VERSION%'; 'choiceKitematicAPP_msg' = 'Installs Kitematic into /Applications/'; 'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%'; @@ -29,4 +29,3 @@ 'UNSUPPORTED_OS_TLE' = "Unsupported OS version detected!"; 'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox requires Mac OS X 10.6 or later."; - From 616181b6f8bf5a3770a6d4a8232abe8869b2c41b Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 13 Jul 2015 17:46:14 -0700 Subject: [PATCH 02/14] OSX Readme.MD change - removing boot2docker references OSX Readme.MD change - removing boot2docker references --- osx/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/README.md b/osx/README.md index 550c47f6fd..27e0681994 100644 --- a/osx/README.md +++ b/osx/README.md @@ -1,7 +1,7 @@ -Boot2Docker for Mac OS X Installer +Docker Toolbox for Mac OS X ============= -Installation [instructions](http://docs.docker.io/installation/mac/) available on the Docker documentation site. +Installation [instructions](https://docs.docker.com/mac/started/) available on the Docker documentation site. How to build ============ From 7d7bdb77287f3da7790bfa531e718105a3214ca9 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Mon, 13 Jul 2015 17:47:09 -0700 Subject: [PATCH 03/14] Fix Toolbox welcome.html. Not engine but client. Engine -> Client --- osx/mpkg/Resources/en.lproj/Welcome.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/mpkg/Resources/en.lproj/Welcome.html b/osx/mpkg/Resources/en.lproj/Welcome.html index e86b5a3923..bdbba23bd9 100644 --- a/osx/mpkg/Resources/en.lproj/Welcome.html +++ b/osx/mpkg/Resources/en.lproj/Welcome.html @@ -14,11 +14,11 @@ The Docker Toolbox installer includes the following:

    -
  • Docker Engine docker binary
    • +
  • Docker Client docker binary
  • Docker Machine docker-machine binary
  • Docker Compose docker-compose binary
  • Kitematic - Desktop GUI for Docker
    • -
  • a shell preconfigured as a Docker command line environment
    • +
  • Docker CLI app

From 2c67051d48d9d97c0440e7a3a3166853417d389e Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 16:18:44 -0700 Subject: [PATCH 04/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb1239ca9f..f5f5f912cd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Docker Toolbox -![illustration-website copy](https://cloud.githubusercontent.com/assets/251292/8635484/dea7d166-27d8-11e5-93f9-76d20b2fa80e.png) +![illustration-website copy](https://cloud.githubusercontent.com/assets/251292/8687317/ef0abbd2-2a43-11e5-816d-b0da5f60d0d4.png) From fcbbbce415787e7bdec14b665c066001c1a2818d Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 16:21:18 -0700 Subject: [PATCH 05/14] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index f5f5f912cd..4cd5e9bff7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1 @@ -# Docker Toolbox - -![illustration-website copy](https://cloud.githubusercontent.com/assets/251292/8687317/ef0abbd2-2a43-11e5-816d-b0da5f60d0d4.png) +![logo image](https://cloud.githubusercontent.com/assets/251292/8687360/5520d19a-2a44-11e5-9ed5-e04e147a711f.png) From a16b5bbb15baf4fedefa98b8a5dff54630e1dcb1 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 16:23:06 -0700 Subject: [PATCH 06/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cd5e9bff7..309e9b223b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -![logo image](https://cloud.githubusercontent.com/assets/251292/8687360/5520d19a-2a44-11e5-9ed5-e04e147a711f.png) +![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687380/905d17a0-2a44-11e5-98bb-9a0fb33ad1f0.png) From c78011622bd00b1a4a1a9bc40abf62ce9b1ae4be Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 16:24:34 -0700 Subject: [PATCH 07/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 309e9b223b..f3c63a1c50 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687380/905d17a0-2a44-11e5-98bb-9a0fb33ad1f0.png) +![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687405/ca2cc318-2a44-11e5-99fb-311b2d4eb32a.png) From 423dd80fe2e410ef4e95678323d8d30e826cd5d2 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 16:26:19 -0700 Subject: [PATCH 08/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3c63a1c50..3fa381c3c2 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687405/ca2cc318-2a44-11e5-99fb-311b2d4eb32a.png) +[![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://toolbox.docker.com) From 313c825a084768c3154950d5a2fa09d8215d64e0 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 22:36:07 -0700 Subject: [PATCH 09/14] Add content to the README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 3fa381c3c2..be23c3a8ba 100644 --- a/README.md +++ b/README.md @@ -1 +1,16 @@ [![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://toolbox.docker.com) + +The Docker Toolbox installs everything you need to get started with +Docker on Mac OS X and Windows, including: + +- Docker (the client) +- Docker Machine +- Docker Compose +- Kitematic (Beta) +- VirtualBox + +## Installation and documentation + +Full documentation [is available +here](https://docs.docker.com/installation/mac/). + From 766da7f8d8e65d57e3eb7914f2dc7be144aeb601 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 23:01:17 -0700 Subject: [PATCH 10/14] Remove makedmg --- osx/Dockerfile | 9 +-------- osx/Makefile | 7 ++++--- osx/makedmg.sh | 43 ------------------------------------------- 3 files changed, 5 insertions(+), 54 deletions(-) delete mode 100755 osx/makedmg.sh diff --git a/osx/Dockerfile b/osx/Dockerfile index 70aab23b78..af3bc7566c 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -186,14 +186,7 @@ RUN sed -i \ -e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \ mpkg/Resources/en.lproj/Localizable.strings -# Make DMG rootfs -RUN mkdir -p /dmg - # Repackage back. Yes, --compression=none is mandatory. # or this won't install in OSX. RUN cd /mpkg && \ - xar -c --compression=none -f /dmg/DockerToolbox.pkg . - -COPY makedmg.sh / - -CMD ["/makedmg.sh", "docker.dmg", "Docker", "/dmg"] + xar -c --compression=none -f /DockerToolbox.pkg . diff --git a/osx/Makefile b/osx/Makefile index 666f4749b3..2bd414ffa4 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -6,13 +6,14 @@ default: dockerbuild dockerbuild: clean docker build -t $(DOCKER_IMAGE) . - docker run --privileged -i -t --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)" - docker cp "$(DOCKER_CONTAINER)":/dmg/DockerToolbox.pkg . + docker run --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)" + docker cp "$(DOCKER_CONTAINER)":/DockerToolbox.pkg . + docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true mv DockerToolbox.pkg DockerToolboxUnsigned.pkg productsign --sign "3rd Party Mac Developer Installer: Docker Inc" DockerToolboxUnsigned.pkg DockerToolbox.pkg rm DockerToolboxUnsigned.pkg clean: - rm -f Docker.pkg + rm -f DockerToolbox.pkg docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true diff --git a/osx/makedmg.sh b/osx/makedmg.sh deleted file mode 100755 index 964e7a8832..0000000000 --- a/osx/makedmg.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# DMG Creation Script -# Usage: makedmg -# -# Based on makedmg by Jon Cowie -# -# imagename: The output file name of the image, ie foo.dmg -# imagetitle: The title of the DMG File as displayed in OS X -# contentdir: The directory containing the content you want the DMG file to contain - -if [ ! $# == 3 ]; then - echo "Usage: $0 " -else - OUTPUT=$1 - TITLE=$2 - CONTENTDIR=$3 - FILESIZE=$(du -sm "${CONTENTDIR}" | cut -f1) - FILESIZE=$((${FILESIZE} + 5)) - USER=$(whoami) - TMPDIR="/tmp/dmgdir" - - if [ "${USER}" != "root" ]; then - echo "$0 must be run as root!" - else - echo "Creating DMG File..." - dd if=/dev/zero of="${OUTPUT}" bs=1M count=$FILESIZE - mkfs.hfsplus -v "${TITLE}" "${OUTPUT}" - - echo "Mounting DMG File..." - mkdir -p ${TMPDIR} - mount -t hfsplus -o loop "${OUTPUT}" "${TMPDIR}" - - echo "Copying content to DMG File..." - cp -R "${CONTENTDIR}"/* "${TMPDIR}" - - echo "Unmounting DMG File..." - umount "${TMPDIR}" - rm -rf "${TMPDIR}" - - echo "All Done!" - fi -fi From 9c396bc11268b3e5a64469c17da26be11548ccfe Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Tue, 14 Jul 2015 23:05:43 -0700 Subject: [PATCH 11/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be23c3a8ba..606ce65a6c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The Docker Toolbox installs everything you need to get started with Docker on Mac OS X and Windows, including: -- Docker (the client) +- Docker Client - Docker Machine - Docker Compose - Kitematic (Beta) From 85566975ba7a677011fb5e3299a72dd750105158 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 15 Jul 2015 14:10:25 -0700 Subject: [PATCH 12/14] No error on signing fail Signed-off-by: Jeffrey Morgan --- osx/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/osx/Makefile b/osx/Makefile index 2bd414ffa4..6771308fbd 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -9,9 +9,8 @@ dockerbuild: clean docker run --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)" docker cp "$(DOCKER_CONTAINER)":/DockerToolbox.pkg . docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true - mv DockerToolbox.pkg DockerToolboxUnsigned.pkg - productsign --sign "3rd Party Mac Developer Installer: Docker Inc" DockerToolboxUnsigned.pkg DockerToolbox.pkg - rm DockerToolboxUnsigned.pkg + productsign --sign "3rd Party Mac Developer Installer: Docker Inc" DockerToolbox.pkg DockerToolboxSigned.pkg || true + mv DockerToolboxSigned.pkg DockerToolbox.pkg || true clean: rm -f DockerToolbox.pkg From 8766c7fd7d4bb2bc3ccfea6be47c9d06f92e04f2 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 15 Jul 2015 14:11:14 -0700 Subject: [PATCH 13/14] Ask users before removing vms Signed-off-by: Jeffrey Morgan --- osx/uninstall.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/osx/uninstall.sh b/osx/uninstall.sh index 4a33ef27e1..7be84fe850 100755 --- a/osx/uninstall.sh +++ b/osx/uninstall.sh @@ -7,8 +7,16 @@ if [ "${USER}" != "root" ]; then exit 2 fi -echo "Removing dev VirtualBox VM..." -docker-machine rm -f $(docker-machine ls -q) +while true; do + read -p "Remove all VMs? (Y/N): " yn + case $yn in + [Yy]* ) docker-machine rm -f $(docker-machine ls -q); break;; + [Nn]* ) break;; + * ) echo "Please answer yes or no.";; + esac +done + +exit 0 echo "Removing docker binaries..." rm -f /usr/local/bin/docker @@ -19,8 +27,4 @@ echo "Removing boot2docker.iso and socket files..." rm -rf ~/.docker rm -rf /usr/local/share/boot2docker -echo "Removing boot2docker OSX files..." -rm -f /private/var/db/receipts/io.boot2docker.* -rm -f /private/var/db/receipts/io.boot2dockeriso.* - echo "All Done!" From e8bc24e37c122d805a8cb5ec9ccacfc1d85c5fa6 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Wed, 15 Jul 2015 15:28:31 -0700 Subject: [PATCH 14/14] Bump for 1.7.1 Signed-off-by: Jeffrey Morgan --- osx/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/Dockerfile b/osx/Dockerfile index af3bc7566c..14e3949f59 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -26,10 +26,10 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV DOCKER_VERSION 1.7.0 +ENV DOCKER_VERSION 1.7.1 RUN curl -fsSL -o /docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz -ENV DOCKER_MACHINE_VERSION 0.3.0 +ENV DOCKER_MACHINE_VERSION 0.3.1-rc1 RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64 RUN chmod +x /docker-machine