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-13 09:13:53 -07:00
parent 1e2694750a 7d43cd80c1
commit 75b30787d3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osx/Dockerfile
View File

@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re
ENV KITEMATIC_VERSION 0.8.2 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.1 ENV INSTALLER_VERSION 1.8.1a
ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e

2
osx/mpkg/Distribution
View File

@ -114,7 +114,7 @@
{ {
test = system.version['ProductVersion']; test = system.version['ProductVersion'];
system.log("OS version detected: " + test); system.log("OS version detected: " + test);
result = (system.compareVersions(test, '10.9') >= 0); result = (system.compareVersions(test, '10.8') >= 0);
} catch (e) { system.log(e); result = false; } } catch (e) { system.log(e); result = false; }
if (!result) if (!result)

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

@ -28,4 +28,4 @@
'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures."; '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_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."; 'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. Please upgrade to Mac OS X 10.8 or later.";