docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Rename to docker CLI

Browse Source
This commit is contained in:
Jeffrey Morgan
2015-07-06 17:15:46 -07:00
parent 3496cd5b87
commit fbae993810
16 changed files with 46 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osx/Dockerfile
View File

@@ -31,9 +31,11 @@ RUN curl -fsSL -o /docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker
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
RUN chmod +x /docker-machine
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
RUN chmod +x /docker-compose
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
@@ -68,8 +70,9 @@ RUN cd /mpkg/docker.pkg && \
mkdir rootfs && \
cd rootfs && \
tar xvzf /docker.tgz && \
cp /docker-machine . && \
cp /docker-compose . && \
mv /docker-machine usr/local/bin/ && \
mv /docker-compose usr/local/bin/ && \
ls -al /usr/local/bin/ && \
find . | cpio -o --format odc | gzip -c > ../Payload && \
mkbom . ../Bom && \
sed -i \
@@ -97,17 +100,17 @@ RUN cd /mpkg/boot2dockeriso.pkg && \
cd .. && \
rm -rf ./rootfs
# dockershell.pkg
RUN cd /mpkg/dockershell.pkg && \
# dockercliapp.pkg
RUN cd /mpkg/dockercliapp.pkg && \
mkdir ./rootfs && \
cd ./rootfs && \
mv /mpkg/Docker\ Shell.app . && \
mv /mpkg/Docker\ CLI.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" \
-e "s/%DOCKERCLIAPP_NUMBER_OF_FILES%/`find . | wc -l`/g" \
-e "s/%DOCKERCLIAPP_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-e "s/%DOCKERCLIAPP_VERSION%/$INSTALLER_VERSION/g" \
../PackageInfo /mpkg/Distribution && \
cd .. && \
rm -rf ./rootfs

26
osx/mpkg/Distribution
View File

@@ -11,11 +11,8 @@
<line choice="choiceDockerMachineCLI"/>
<line choice="choiceDockerComposeCLI"/>
<line choice="choiceBoot2DockerISO"/>
<line choice="choiceDockerShell"/>
<line choice="choiceVBoxKEXTs"/>
<line choice="choiceDockerCLIApp"/>
<line choice="choiceVBox"/>
<line choice="choiceVBoxCLI"/>
</choices-outline>
<choice id="choiceDockerCLI" title="choiceDockerCLI_title" description="choiceDockerCLI_msg" start_selected="true" start_enabled="false" start_visible="true">
<pkg-ref id="io.docker.pkg.docker"/>
@@ -29,8 +26,8 @@
<choice id="choiceBoot2DockerISO" title="choiceBoot2DockerISO_title" description="choiceBoot2DockerISO_msg" start_selected="true" start_enabled="false" start_visible="true">
<pkg-ref id="io.boot2dockeriso.pkg.boot2dockeriso"/>
</choice>
<choice id="choiceDockerShell" title="choiceDockerShell_title" description="choiceDockerShell_msg" start_selected="true" start_enabled="false" start_visible="true">
<pkg-ref id="io.docker.pkg.dockershell"/>
<choice id="choiceDockerCLIApp" title="choiceDockerCLIApp_title" description="choiceDockerCLIApp_msg" start_selected="true" start_enabled="false" start_visible="true">
<pkg-ref id="io.docker.pkg.dockercliapp"/>
</choice>
<pkg-ref id="io.docker.pkg.docker" auth="Root" version="%DOCKER_VERSION%" installKBytes="%DOCKER_INSTALL_KBYTES%">#docker.pkg</pkg-ref>
<pkg-ref id="io.docker.pkg.docker">
@@ -40,8 +37,8 @@
<pkg-ref id="io.boot2dockeriso.pkg.boot2dockeriso">
<bundle-version/>
</pkg-ref>
<pkg-ref id="io.docker.pkg.dockershell" auth="Root" version="%DOCKERSHELL_VERSION%" installKBytes="%DOCKERSHELL_INSTALL_KBYTES%">#dockershell.pkg</pkg-ref>
<pkg-ref id="io.docker.pkg.dockershell">
<pkg-ref id="io.docker.pkg.dockercliapp" auth="Root" version="%DOCKERCLIAPP_VERSION%" installKBytes="%DOCKERCLIAPP_INSTALL_KBYTES%">#dockercliapp.pkg</pkg-ref>
<pkg-ref id="io.docker.pkg.dockercliapp">
<bundle-version/>
</pkg-ref>
<product id="io.docker.mpkg.docker" version="%INSTALLER_VERSION%"/>
@@ -104,18 +101,11 @@
}
/* js:pkmk:end */
</script>
<choice id="choiceVBoxKEXTs" title="choiceVBoxKEXTs_title" description="choiceVBoxKEXTs_msg" start_selected="true" start_enabled="true" start_visible="true">
<pkg-ref id="org.virtualbox.pkg.vboxkexts"/>
</choice>
<choice id="choiceVBox" title="choiceVBox_title" description="choiceVBox_msg" start_selected="true" start_enabled="true" start_visible="true">
<pkg-ref id="org.virtualbox.pkg.virtualbox"/>
<pkg-ref id="org.virtualbox.pkg.vboxkexts" auth="Root" version="%VBOX_VERSION%" installKBytes="935">#VBoxKEXTs.pkg</pkg-ref>
<pkg-ref id="org.virtualbox.pkg.virtualbox" auth="Root" version="%VBOX_VERSION%" installKBytes="247220">#VirtualBox.pkg</pkg-ref>
<pkg-ref id="org.virtualbox.pkg.virtualboxcli" auth="Root" version="%VBOX_VERSION%" installKBytes="4">#VirtualBoxCLI.pkg</pkg-ref>
</choice>
<choice id="choiceVBoxCLI" title="choiceVBoxCLI_title" description="choiceVBoxCLI_msg" start_selected="true" start_enabled="true" start_visible="true">
<pkg-ref id="org.virtualbox.pkg.virtualboxcli"/>
</choice>
<pkg-ref id="org.virtualbox.pkg.vboxkexts" auth="Root" version="%VBOX_VERSION%" installKBytes="935">#VBoxKEXTs.pkg</pkg-ref>
<pkg-ref id="org.virtualbox.pkg.virtualbox" auth="Root" version="%VBOX_VERSION%" installKBytes="247220">#VirtualBox.pkg</pkg-ref>
<pkg-ref id="org.virtualbox.pkg.virtualboxcli" auth="Root" version="%VBOX_VERSION%" installKBytes="4">#VirtualBoxCLI.pkg</pkg-ref>
<pkg-ref id="org.virtualbox.pkg.vboxkexts">
<bundle-version>
<bundle CFBundleShortVersionString="%VBOX_VERSION%" CFBundleVersion="%VBOX_VERSION%" id="org.virtualbox.kext.VBoxNetAdp" path="VBoxNetAdp.kext"/>

4
osx/mpkg/Docker Shell.app/Contents/Info.plist → osx/mpkg/Docker CLI.app/Contents/Info.plist
View File

@@ -11,11 +11,11 @@
<key>CFBundleIconFile</key>
<string>applet</string>
<key>CFBundleIdentifier</key>
<string>com.apple.ScriptEditor.id.boot2docker</string>
<string>com.apple.ScriptEditor.id.dockercliapp</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Docker Shell</string>
<string>Docker CLI</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>

0
osx/mpkg/Docker Shell.app/Contents/MacOS/applet → osx/mpkg/Docker CLI.app/Contents/MacOS/applet
View File

0
osx/mpkg/Docker Shell.app/Contents/PkgInfo → osx/mpkg/Docker CLI.app/Contents/PkgInfo
View File

BIN
osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt Normal file
View File

Binary file not shown.

BIN
osx/mpkg/Docker CLI.app/Contents/Resources/applet.icns Normal file
View File

Binary file not shown.

0
osx/mpkg/Docker Shell.app/Contents/Resources/applet.rsrc → osx/mpkg/Docker CLI.app/Contents/Resources/applet.rsrc
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

0
osx/mpkg/Docker Shell.app/Contents/Resources/description.rtfd/TXT.rtf → osx/mpkg/Docker CLI.app/Contents/Resources/description.rtfd/TXT.rtf
View File

BIN
osx/mpkg/Docker Shell.app/Contents/Resources/Scripts/main.scpt
View File

Binary file not shown.

BIN
osx/mpkg/Docker Shell.app/Contents/Resources/applet.icns
View File

Binary file not shown.

20
osx/mpkg/Resources/en.lproj/Localizable.strings
View File

@@ -1,29 +1,23 @@
'docker_title' = 'Boot2Docker for Mac OS X';
'docker_title' = 'Docker Toolbox';
'choiceDockerCLI_title' = 'Docker client for Mac OS X';
'choiceDockerCLI_msg' = 'Installs the Docker for Mac OS X client into /usr/local/bin/';
'choiceDockerCLI_title' = 'Docker';
'choiceDockerCLI_msg' = 'Installs the Docker client for Mac OS X into /usr/local/bin/';
'choiceDockerMachineCLI_title' = 'Docker Machine for Mac OS X';
'choiceDockerMachineCLI_title' = 'Docker Machine';
'choiceDockerMachineCLI_msg' = 'Installs the Docker Machine binary into /usr/local/bin/';
'choiceDockerComposeCLI_title' = 'Docker Compose for Mac OS X';
'choiceDockerComposeCLI_title' = 'Docker Compose';
'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.';
'choiceDockerCLIApp_title' = 'Docker CLI Quick-start applet';
'choiceDockerCLIApp_msg' = 'Installs the Docker CLI Quick-start applet into /Applications/';
'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.";

BIN
osx/mpkg/Resources/toolbox.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 20 KiB

10
osx/mpkg/dockercliapp.pkg/PackageInfo Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<pkg-info overwrite-permissions="true" relocatable="false" identifier="io.docker.pkg.dockercliapp" postinstall-action="none" version="%DOCKERCLIAPP_VERSION%" format-version="2" generator-version="steeve's strong hands" install-location="/Applications/" auth="root">
<payload numberOfFiles="%DOCKERCLIAPP_NUMBER_OF_FILES%" installKBytes="%DOCKERCLIAPP_INSTALL_KBYTES%"/>
<bundle-version/>
<upgrade-bundle/>
<update-bundle/>
<atomic-update-bundle/>
<strict-identifier/>
<relocate/>
</pkg-info>

10
osx/mpkg/dockershell.pkg/PackageInfo
View File

@@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<pkg-info overwrite-permissions="true" relocatable="false" identifier="io.docker.pkg.dockershell" postinstall-action="none" version="%DOCKERSHELL_VERSION%" format-version="2" generator-version="steeve's strong hands" install-location="/Applications/" auth="root">
<payload numberOfFiles="%DOCKERSHELL_NUMBER_OF_FILES%" installKBytes="%DOCKERSHELL_INSTALL_KBYTES%"/>
<bundle-version/>
<upgrade-bundle/>
<update-bundle/>
<atomic-update-bundle/>
<strict-identifier/>
<relocate/>
</pkg-info>

25
osx/uninstall.sh
View File

@@ -2,34 +2,25 @@
# 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 "Stopping docker-machine processes..."
docker-machine rm -f $(docker-machine ls -q)
echo "Removing boot2docker executable..."
rm -f /usr/local/bin/boot2docker
echo "Removing docker binaries..."
rm -f /usr/local/bin/docker
rm -f /usr/local/bin/docker-machine
rm -f /usr/local/bin/docker-compose
echo "Removing boot2docker ISO and socket files..."
rm -rf ~/.boot2docker
echo "Removing boot2docker.iso and socket files..."
rm -rf ~/.docker
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!"