From 19c6dcf0cbec4314977ccc2f2c8719c97d98e038 Mon Sep 17 00:00:00 2001 From: Dirk Breuer Date: Sat, 6 Feb 2016 20:15:54 +0100 Subject: [PATCH 1/4] Updated .env.sample for local builds --- .env.sample | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index d71dcb4..ee699a5 100644 --- a/.env.sample +++ b/.env.sample @@ -1 +1,5 @@ -ATLAS_TOKEN= \ No newline at end of file +ATLAS_TOKEN= +DEVELOPER_PLAYBOOK= +ATLAS_BUILD_SLUG= +ATLAS_TOKEN= +ATLAS_BUILD_NUMBER= \ No newline at end of file From b52ddc3baa941913ef29096f083a2c529ed86cdd Mon Sep 17 00:00:00 2001 From: Dirk Breuer Date: Sat, 6 Feb 2016 20:16:39 +0100 Subject: [PATCH 2/4] There is no need to define json gem in Gemfile since it is part of recent Rubies anyway. --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a359d9..1d6ddab 100644 --- a/Gemfile +++ b/Gemfile @@ -2,5 +2,4 @@ source "https://rubygems.org" gem "rake" -gem "json" gem "dotenv" diff --git a/Gemfile.lock b/Gemfile.lock index 96f457b..4b84af2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,6 @@ GEM remote: https://rubygems.org/ specs: dotenv (2.0.2) - json (1.8.1) rake (10.4.2) PLATFORMS @@ -10,7 +9,6 @@ PLATFORMS DEPENDENCIES dotenv - json rake BUNDLED WITH From a1c3f9f624eaece2b9012f85476c1e0fff753dde Mon Sep 17 00:00:00 2001 From: Dirk Breuer Date: Sat, 6 Feb 2016 20:20:13 +0100 Subject: [PATCH 3/4] Use Dotenv in Rakefile --- Rakefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Rakefile b/Rakefile index 1638188..d61fb10 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,12 @@ +require "rubygems" +require "bundler/setup" + +require "dotenv" require "json" require "yaml" +Dotenv.load + DEFAULT_BASE_OS = "ubuntu-15.04" DEFAULT_VIRT = "vmware" From b85c066c3b6375c076450fd07d809afad12acd9e Mon Sep 17 00:00:00 2001 From: Dirk Breuer Date: Sat, 6 Feb 2016 21:00:42 +0100 Subject: [PATCH 4/4] Install vmtools via apt-get since this will not break stuff. --- scripts/common/vmtools.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/common/vmtools.sh b/scripts/common/vmtools.sh index 5acdbba..ad9474c 100644 --- a/scripts/common/vmtools.sh +++ b/scripts/common/vmtools.sh @@ -18,15 +18,9 @@ virtualbox-iso|virtualbox-ovf) ;; vmware-iso|vmware-vmx) - mkdir -p /tmp/vmfusion; - mkdir -p /tmp/vmfusion-archive; - mount -o loop $HOME_DIR/linux.iso /tmp/vmfusion; - tar xzf /tmp/vmfusion/VMwareTools-*.tar.gz -C /tmp/vmfusion-archive; - /tmp/vmfusion-archive/vmware-tools-distrib/vmware-install.pl --default; - umount /tmp/vmfusion; - rm -rf /tmp/vmfusion; - rm -rf /tmp/vmfusion-archive; - rm -f $HOME_DIR/*.iso; + apt-get install open-vm-tools; + apt-get install open-vm-tools-dkms; + dpkg-reconfigure open-vm-tools-dkms; ;; parallels-iso|parallels-pvm)