You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jc...@apache.org on 2016/04/28 21:47:40 UTC

aurora git commit: Add missing Mesos dependency to packer build script.

Repository: aurora
Updated Branches:
  refs/heads/master 170a7d2f9 -> 450d88156


Add missing Mesos dependency to packer build script.

See http://markmail.org/message/rofuiaclgkesfx3o for full details.

Reviewed at https://reviews.apache.org/r/46786/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/450d8815
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/450d8815
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/450d8815

Branch: refs/heads/master
Commit: 450d88156725d1e7443bf82a7bc78186d492728b
Parents: 170a7d2
Author: Joshua Cohen <jc...@apache.org>
Authored: Thu Apr 28 14:47:20 2016 -0500
Committer: Joshua Cohen <jc...@apache.org>
Committed: Thu Apr 28 14:47:20 2016 -0500

----------------------------------------------------------------------
 build-support/packer/build.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/450d8815/build-support/packer/build.sh
----------------------------------------------------------------------
diff --git a/build-support/packer/build.sh b/build-support/packer/build.sh
index 658dbc4..76197c3 100644
--- a/build-support/packer/build.sh
+++ b/build-support/packer/build.sh
@@ -38,7 +38,7 @@ function install_base_packages {
       libcurl4-nss-dev \
       libsasl2-dev \
       libsvn-dev \
-      openjdk-8-jdk \
+      openjdk-8-jdk-headless \
       python-dev
   update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
   # Installing zookeeperd as a separate command, as otherwise openjdk-7-jdk is also installed.
@@ -60,12 +60,13 @@ function install_docker {
 }
 
 function install_mesos {
-  URL_BASE='http://repos.mesosphere.com/ubuntu/pool/main/m/mesos'
-  DEB_URL="$URL_BASE/mesos_${MESOS_VERSION}-2.0.15.ubuntu1404_amd64.deb"
-  deb=$(basename $DEB_URL)
-  wget -c "$DEB_URL"
-  dpkg --install $deb
-  rm $deb
+  apt-key adv --keyserver keyserver.ubuntu.com --recv E56151BF
+  DISTRO=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
+  CODENAME=$(lsb_release -cs)
+  echo "deb http://repos.mesosphere.io/${DISTRO} ${CODENAME} main" \
+      > /etc/apt/sources.list.d/mesosphere.list
+  apt-get update
+  apt-get -y install mesos=${MESOS_VERSION}*
 }
 
 function install_thrift {