From 5d88c0e072bda68270a0131017a58d943c05d982 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 13 Aug 2015 08:47:01 -0700 Subject: [PATCH 1/2] Fix requirement detection to 10.8 Signed-off-by: Jeffrey Morgan --- osx/Dockerfile | 2 +- osx/mpkg/Distribution | 2 +- osx/mpkg/Resources/en.lproj/Localizable.strings | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osx/Dockerfile b/osx/Dockerfile index 28db7cad8e..b44770c0bc 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV DOCKER_VERSION 1.8.1 +ENV DOCKER_VERSION 1.8.1a RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION RUN chmod +x /docker diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution index d355a2429f..ed84ec8e7c 100644 --- a/osx/mpkg/Distribution +++ b/osx/mpkg/Distribution @@ -114,7 +114,7 @@ { test = system.version['ProductVersion']; 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; } if (!result) diff --git a/osx/mpkg/Resources/en.lproj/Localizable.strings b/osx/mpkg/Resources/en.lproj/Localizable.strings index cc942113d9..8d7bb9925b 100644 --- a/osx/mpkg/Resources/en.lproj/Localizable.strings +++ b/osx/mpkg/Resources/en.lproj/Localizable.strings @@ -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_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."; From 7d43cd80c1a38cd0a777bf1991892f4b97776b77 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Thu, 13 Aug 2015 09:13:09 -0700 Subject: [PATCH 2/2] Bump to 1.8.1a Signed-off-by: Jeffrey Morgan --- osx/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osx/Dockerfile b/osx/Dockerfile index b44770c0bc..eb92d8552b 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS # Download the Docker parts -ENV DOCKER_VERSION 1.8.1a +ENV DOCKER_VERSION 1.8.1 RUN curl -fsSL -o /docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION RUN chmod +x /docker @@ -44,7 +44,7 @@ RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/re 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 -ENV INSTALLER_VERSION 1.8.1 +ENV INSTALLER_VERSION 1.8.1a ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e