commit 3496cd5b8739ed05fd9bdcd78bba03d656f50657 Author: Jeffrey Morgan Date: Mon Jul 6 08:42:20 2015 -0700 Initial OS X commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..799f7f398b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +DockerToolbox.pkg diff --git a/osx/Dockerfile b/osx/Dockerfile new file mode 100644 index 0000000000..340f848233 --- /dev/null +++ b/osx/Dockerfile @@ -0,0 +1,141 @@ +FROM debian:wheezy + +RUN apt-get update && apt-get -y install \ + autoconf build-essential curl \ + libxml2-dev libssl-dev \ + p7zip-full \ + hfsplus hfsutils hfsprogs cpio + +# We need the bomutils to create the Mac OS X Bill of Materials (BOM) files. +# https://github.com/hogliux/bomutils +RUN curl -fsSL https://github.com/hogliux/bomutils/archive/0.2.tar.gz | tar xvz && \ + cd bomutils-* && \ + make && make install + +# Needed to pack/unpack the .pkg files +RUN curl -fsSL https://github.com/mackyle/xar/archive/xar-1.6.1.tar.gz | tar xvz && \ + cd xar-*/xar && \ + ./autogen.sh && ./configure && \ + make && make install + +ENV VBOX_VERSION 4.3.28 +ENV VBOX_REV 100309 + +RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VirtualBox-$VBOX_VERSION-$VBOX_REV-OSX.dmg \ + && echo "$(curl -fsSL 'http://download.virtualbox.org/virtualbox/'"$VBOX_VERSION"'/SHA256SUMS' | awk '$2 ~ /-OSX.dmg$/ { print $1 }') */vbox.dmg" | sha256sum -c - + +# Download the Docker parts + +ENV DOCKER_VERSION 1.7.0 +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 +RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64 + +ENV DOCKER_COMPOSE_VERSION 1.3.1 +RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64 + +ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION +RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v${BOOT2DOCKER_ISO_VERSION}/boot2docker.iso + +ENV INSTALLER_VERSION $DOCKER_VERSION + +# Start building package + +COPY mpkg /mpkg + +# Extract the VirtualBox .pkg +RUN mkdir -p /mpkg/vbox && \ + cd /mpkg/vbox && \ + 7z x /vbox.dmg -ir'!*.hfs' && \ + 7z x `find . -name '*.hfs'` -ir'!*.pkg' && \ + mv VirtualBox/VirtualBox.pkg . && \ + rm -rf vbox.dmg && \ + rm -rf `find . -name '*.hfs'` + +# Extract the .pkg files +RUN cd /mpkg/vbox && \ + mv VirtualBox.pkg /tmp && \ + xar -xf /tmp/VirtualBox.pkg && \ + rm -rf /tmp/VirtualBox.pkg + +RUN cd /mpkg/vbox && \ + mv *.pkg .. && \ + rm -rf vbox + +# docker.pkg +RUN cd /mpkg/docker.pkg && \ + mkdir rootfs && \ + cd rootfs && \ + tar xvzf /docker.tgz && \ + cp /docker-machine . && \ + cp /docker-compose . && \ + find . | cpio -o --format odc | gzip -c > ../Payload && \ + mkbom . ../Bom && \ + sed -i \ + -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 + +# boot2dockeriso.pkg +RUN cd /mpkg/boot2dockeriso.pkg && \ + mkdir ./rootfs && \ + cd ./rootfs && \ + cp /boot2docker.iso . && \ + find . | cpio -o --format odc | gzip -c > ../Payload && \ + mkbom . ../Bom && \ + sed -i \ + -e "s/%BOOT2DOCKER_ISO_NUMBER_OF_FILES%/`find . | wc -l`/g" \ + -e "s/%BOOT2DOCKER_ISO_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ + -e "s/%BOOT2DOCKER_ISO_VERSION%/$BOOT2DOCKER_ISO_VERSION/g" \ + ../PackageInfo /mpkg/Distribution && \ + cd .. && \ + rm -rf ./rootfs + +# dockershell.pkg +RUN cd /mpkg/dockershell.pkg && \ + mkdir ./rootfs && \ + cd ./rootfs && \ + mv /mpkg/Docker\ Shell.app . && \ + find . | cpio -o --format odc | gzip -c > ../Payload && \ + mkbom . ../Bom && \ + sed -i \ + -e "s/%DOCKERSHELL_NUMBER_OF_FILES%/`find . | wc -l`/g" \ + -e "s/%DOCKERSHELL_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \ + -e "s/%DOCKERSHELL_VERSION%/$INSTALLER_VERSION/g" \ + ../PackageInfo /mpkg/Distribution && \ + cd .. && \ + rm -rf ./rootfs + +RUN sed -i \ + -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ + mpkg/Resources/en.lproj/Welcome.html +RUN sed -i \ + -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ + mpkg/Resources/en.lproj/Installed.html +RUN sed -i \ + -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ + /mpkg/Distribution && \ + sed -i \ + -e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \ + /mpkg/Distribution && \ + sed -i \ + -e "s/%VBOX_VERSION%/$VBOX_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"] diff --git a/osx/LICENSE b/osx/LICENSE new file mode 100644 index 0000000000..27448585ad --- /dev/null +++ b/osx/LICENSE @@ -0,0 +1,191 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright 2014 Docker, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/osx/Makefile b/osx/Makefile new file mode 100644 index 0000000000..6fd7d50032 --- /dev/null +++ b/osx/Makefile @@ -0,0 +1,15 @@ +DOCKER_IMAGE := osx-installer +DOCKER_CONTAINER := build-osx-installer + +default: dockerbuild + @true + +dockerbuild: clean + docker build -t $(DOCKER_IMAGE) . + docker run --privileged -i -t --name "$(DOCKER_CONTAINER)" "$(DOCKER_IMAGE)" + docker cp "$(DOCKER_CONTAINER)":/dmg/DockerToolbox.pkg . + +clean: + rm -f Docker.pkg + docker rm "$(DOCKER_CONTAINER)" 2>/dev/null || true + diff --git a/osx/README.md b/osx/README.md new file mode 100644 index 0000000000..550c47f6fd --- /dev/null +++ b/osx/README.md @@ -0,0 +1,9 @@ +Boot2Docker for Mac OS X Installer +============= + +Installation [instructions](http://docs.docker.io/installation/mac/) available on the Docker documentation site. + +How to build +============ + +Running `make` will produce a `Docker.pkg` installer. diff --git a/osx/makedmg.sh b/osx/makedmg.sh new file mode 100755 index 0000000000..964e7a8832 --- /dev/null +++ b/osx/makedmg.sh @@ -0,0 +1,43 @@ +#!/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 diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution new file mode 100644 index 0000000000..2d8c4d2be8 --- /dev/null +++ b/osx/mpkg/Distribution @@ -0,0 +1,135 @@ + + + docker_title + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #docker.pkg + + + + #boot2dockeriso.pkg + + + + #dockershell.pkg + + + + + + + + + + + + + + + + + + #VBoxKEXTs.pkg + #VirtualBox.pkg + #VirtualBoxCLI.pkg + + + + + + + + + + + + + + + + + diff --git a/osx/mpkg/Docker Shell.app/Contents/Info.plist b/osx/mpkg/Docker Shell.app/Contents/Info.plist new file mode 100644 index 0000000000..e42d2966cf --- /dev/null +++ b/osx/mpkg/Docker Shell.app/Contents/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleAllowMixedLocalizations + + CFBundleDevelopmentRegion + English + CFBundleExecutable + applet + CFBundleIconFile + applet + CFBundleIdentifier + com.apple.ScriptEditor.id.boot2docker + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Docker Shell + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.3.0 + CFBundleSignature + aplt + LSMinimumSystemVersionByArchitecture + + x86_64 + 10.6 + + LSRequiresCarbon + + NSHumanReadableCopyright + Docker Inc + WindowState + + dividerCollapsed + + eventLogLevel + -1 + name + ScriptWindowState + positionOfDivider + 441 + savedFrame + 832 234 942 765 0 0 1920 1058 + selectedTabView + event log + + + diff --git a/osx/mpkg/Docker Shell.app/Contents/MacOS/applet b/osx/mpkg/Docker Shell.app/Contents/MacOS/applet new file mode 100755 index 0000000000..8057b9e3ba Binary files /dev/null and b/osx/mpkg/Docker Shell.app/Contents/MacOS/applet differ diff --git a/osx/mpkg/Docker Shell.app/Contents/PkgInfo b/osx/mpkg/Docker Shell.app/Contents/PkgInfo new file mode 100644 index 0000000000..3253614c40 --- /dev/null +++ b/osx/mpkg/Docker Shell.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPLaplt \ No newline at end of file diff --git a/osx/mpkg/Docker Shell.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker Shell.app/Contents/Resources/Scripts/main.scpt new file mode 100644 index 0000000000..4f62bb98b9 Binary files /dev/null and b/osx/mpkg/Docker Shell.app/Contents/Resources/Scripts/main.scpt differ diff --git a/osx/mpkg/Docker Shell.app/Contents/Resources/applet.icns b/osx/mpkg/Docker Shell.app/Contents/Resources/applet.icns new file mode 100644 index 0000000000..d11108d47e Binary files /dev/null and b/osx/mpkg/Docker Shell.app/Contents/Resources/applet.icns differ diff --git a/osx/mpkg/Docker Shell.app/Contents/Resources/applet.rsrc b/osx/mpkg/Docker Shell.app/Contents/Resources/applet.rsrc new file mode 100644 index 0000000000..42549ab618 Binary files /dev/null and b/osx/mpkg/Docker Shell.app/Contents/Resources/applet.rsrc differ diff --git a/osx/mpkg/Docker Shell.app/Contents/Resources/description.rtfd/TXT.rtf b/osx/mpkg/Docker Shell.app/Contents/Resources/description.rtfd/TXT.rtf new file mode 100644 index 0000000000..05a9a530fa --- /dev/null +++ b/osx/mpkg/Docker Shell.app/Contents/Resources/description.rtfd/TXT.rtf @@ -0,0 +1,4 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf200 +{\fonttbl} +{\colortbl;\red255\green255\blue255;} +} \ No newline at end of file diff --git a/osx/mpkg/Resources/en.lproj/Installed.html b/osx/mpkg/Resources/en.lproj/Installed.html new file mode 100644 index 0000000000..53e86d5e3c --- /dev/null +++ b/osx/mpkg/Resources/en.lproj/Installed.html @@ -0,0 +1,30 @@ + + + + Docker Toolbox for Mac OS X + + + +

+

    +
  • Quick-Start: Run Docker Shell (located in Applications), which will open a terminal window. Then, start a test container with:
    docker run hello-world
  • +
+
+
+
    +
  • To save and share container images, automate workflows, and more sign-up for a free Docker Hub account.
  • +
+
+
+
    +
  • You can upgrade your existing Docker dev VM without data loss by running:
    docker-machine upgrade dev
  • +
+
+
+
    +
  • The docker, docker-machine, and docker-compose binaries are in /usr/local/bin which you can access from your terminal.
    + For further information, please see the Docker OS X installation documentation.
  • +
+

+ + diff --git a/osx/mpkg/Resources/en.lproj/Localizable.strings b/osx/mpkg/Resources/en.lproj/Localizable.strings new file mode 100644 index 0000000000..03d034ee1f --- /dev/null +++ b/osx/mpkg/Resources/en.lproj/Localizable.strings @@ -0,0 +1,35 @@ +'docker_title' = 'Boot2Docker for Mac OS X'; + +'choiceDockerCLI_title' = 'Docker client for Mac OS X'; +'choiceDockerCLI_msg' = 'Installs the Docker for Mac OS X client into /usr/local/bin/'; + +'choiceDockerMachineCLI_title' = 'Docker Machine for Mac OS X'; +'choiceDockerMachineCLI_msg' = 'Installs the Docker Machine binary into /usr/local/bin/'; + +'choiceDockerComposeCLI_title' = 'Docker Compose for Mac OS X'; +'choiceDockerComposeCLI_msg' = 'Installs the Docker Compose binary into /usr/local/bin/'; + +'choiceBoot2DockerISO_title' = 'Boot2Docker ISO'; +'choiceBoot2DockerISO_msg' = 'Installs the boot2docker.iso into /usr/local/share/'; + +'choiceDockerShell_title' = 'Docker Shell Quick-start applet for Mac OS X'; +'choiceDockerShell_msg' = 'Installs the Docker Shell Quick-start applet into /Applications/'; + +'choiceVBoxKEXTs_title' = 'Oracle VM VirtualBox Kernel Extensions %VBOX_VERSION%'; +'choiceVBoxKEXTs_msg' = 'Installs the Oracle VM VirtualBox Kernel Extensions into /Library/Application Support/VirtualBox.'; + +'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%'; +'choiceVBox_msg' = 'Installs the Oracle VM VirtualBox application into /Applications.'; + +'choiceVBoxCLI_title' = 'Oracle VM VirtualBox Command Line Utilities %VBOX_VERSION%'; +'choiceVBoxCLI_msg' = 'Installs the Oracle VM VirtualBox command line utilities into /usr/bin.'; + +'RUNNING_VMS_TLE' = "Running VirtualBox detected!"; +'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please shutdown all running VirtualBox machines and exit VirtualBox then restart the installation."; + +'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!"; +'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures."; + +'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."; + diff --git a/osx/mpkg/Resources/en.lproj/Welcome.html b/osx/mpkg/Resources/en.lproj/Welcome.html new file mode 100644 index 0000000000..e987fdf210 --- /dev/null +++ b/osx/mpkg/Resources/en.lproj/Welcome.html @@ -0,0 +1,25 @@ + + + + Docker Toolbox for Mac OS X + + +

Docker Toolbox for Mac OS X

+ +

+ This installer will guide you through the steps to install + Docker Toolbox for Mac OS X v%INSTALLER_VERSION%. +

+ +

+ The docker, docker-machine, and docker-compose binaries will be installed to /usr/local/bin, and can then be run from your Terminal. +
+ For further information, please see the Docker OS X installation documentation. +

+ + +

+ To continue, click Continue. +

+ + diff --git a/osx/mpkg/Resources/logo-docker.png b/osx/mpkg/Resources/logo-docker.png new file mode 100644 index 0000000000..043e93c00b Binary files /dev/null and b/osx/mpkg/Resources/logo-docker.png differ diff --git a/osx/mpkg/Resources/logo-docker_transparent.png b/osx/mpkg/Resources/logo-docker_transparent.png new file mode 100644 index 0000000000..059f974b91 Binary files /dev/null and b/osx/mpkg/Resources/logo-docker_transparent.png differ diff --git a/osx/mpkg/Resources/toolbox.png b/osx/mpkg/Resources/toolbox.png new file mode 100644 index 0000000000..aa57b4db20 Binary files /dev/null and b/osx/mpkg/Resources/toolbox.png differ diff --git a/osx/mpkg/boot2dockeriso.pkg/PackageInfo b/osx/mpkg/boot2dockeriso.pkg/PackageInfo new file mode 100644 index 0000000000..baf3ad2d59 --- /dev/null +++ b/osx/mpkg/boot2dockeriso.pkg/PackageInfo @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/osx/mpkg/docker.pkg/PackageInfo b/osx/mpkg/docker.pkg/PackageInfo new file mode 100644 index 0000000000..f4db27a750 --- /dev/null +++ b/osx/mpkg/docker.pkg/PackageInfo @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/osx/mpkg/dockershell.pkg/PackageInfo b/osx/mpkg/dockershell.pkg/PackageInfo new file mode 100644 index 0000000000..6d47cc3d0e --- /dev/null +++ b/osx/mpkg/dockershell.pkg/PackageInfo @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/osx/uninstall.sh b/osx/uninstall.sh new file mode 100755 index 0000000000..865e2c5a63 --- /dev/null +++ b/osx/uninstall.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# Uninstall Script + +if [ "$(which boot2docker)" == "" ]; then + echo "boot2docker does not exist on your machine!" + exit 1 +fi + +if [ "${USER}" != "root" ]; then + echo "$0 must be run as root!" + exit 2 +fi + +echo "Stopping boot2docker processes..." +boot2docker stop && boot2docker delete + +echo "Removing boot2docker executable..." +rm -f /usr/local/bin/boot2docker + +echo "Removing boot2docker ISO and socket files..." +rm -rf ~/.boot2docker +rm -rf /usr/local/share/boot2docker + +echo "Removing boot2docker SSH keys..." +rm -f ~/.ssh/id_boot2docker* + +echo "Removing boot2docker OSX files..." +rm -f /private/var/db/receipts/io.boot2docker.* +rm -f /private/var/db/receipts/io.boot2dockeriso.* + +echo "Removing Docker executable..." +rm -f /usr/local/bin/docker + +echo "All Done!"