Moved to the new docker official repos that install docker-engine ins…

…tead of lxc-docker

bootstrap/aws-public/config-default.sh

@@ -18,8 +18,8 @@ export ANSIBLE_SSH_ARGS="-F ${APOLLO_ROOT}/terraform/${APOLLO_PROVIDER}/ssh.conf
 # so no really needed to export them. Exporting for consitency.
 export TF_VAR_atlas_artifact_master=${TF_VAR_atlas_artifact_master:-capgemini/apollo-ubuntu-14.04-amd64}
 export TF_VAR_atlas_artifact_slave=${TF_VAR_atlas_artifact_slave:-capgemini/apollo-ubuntu-14.04-amd64}
-export TF_VAR_atlas_artifact_version_master=${TF_VAR_atlas_artifact_version_master:-11}
-export TF_VAR_atlas_artifact_version_slave=${TF_VAR_atlas_artifact_version_slave:-11}
+export TF_VAR_atlas_artifact_version_master=${TF_VAR_atlas_artifact_version_master:-13}
+export TF_VAR_atlas_artifact_version_slave=${TF_VAR_atlas_artifact_version_slave:-13}
 
 export TF_VAR_region=${TF_VAR_region:-eu-west-1}
 export TF_VAR_master_size=${TF_VAR_master_size:-m3.medium}

bootstrap/aws/config-default.sh

@@ -19,8 +19,8 @@ export ANSIBLE_SSH_ARGS="-F ${APOLLO_ROOT}/terraform/${APOLLO_PROVIDER}/ssh.conf
 # so no really needed to export them. Exporting for consitency.
 export TF_VAR_atlas_artifact_master=${TF_VAR_atlas_artifact_master:-capgemini/apollo-ubuntu-14.04-amd64}
 export TF_VAR_atlas_artifact_slave=${TF_VAR_atlas_artifact_slave:-capgemini/apollo-ubuntu-14.04-amd64}
-export TF_VAR_atlas_artifact_version_master=${TF_VAR_atlas_artifact_version_master:-11}
-export TF_VAR_atlas_artifact_version_slave=${TF_VAR_atlas_artifact_version_slave:-11}
+export TF_VAR_atlas_artifact_version_master=${TF_VAR_atlas_artifact_version_master:-13}
+export TF_VAR_atlas_artifact_version_slave=${TF_VAR_atlas_artifact_version_slave:-13}
 
 export TF_VAR_region=${TF_VAR_region:-eu-west-1}
 export TF_VAR_master_size=${TF_VAR_master_size:-m3.medium}

packer/scripts/ubuntu/install_docker.sh

@@ -5,21 +5,14 @@ set -o pipefail
 sudo apt-get -y update
 sudo apt-get install -y linux-image-extra-$(uname -r)
 
-# This is a docker script from https://get.docker.com/ubuntu/. We added it here directly to downgrade docker version
-# from 1.7.1 to 1.7.0. This is a temporary solution to get rid of the issue https://github.com/Capgemini/Apollo/issues/428.
-
-# Check that HTTPS transport is available to APT
-if [ ! -e /usr/lib/apt/methods/https ]; then
-  sudo apt-get update
-  sudo apt-get install -y apt-transport-https
-fi
+# Install docker
 # Add the repository to your APT sources
-sudo echo 'deb https://get.docker.com/ubuntu docker main' | tee /etc/apt/sources.list.d/docker.list
+sudo echo 'deb https://apt.dockerproject.org/repo ubuntu-trusty main' | tee /etc/apt/sources.list.d/docker.list
 # Then import the repository key
-sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-# Install docker
+sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+# Install docker-engine
 sudo apt-get update
-sudo apt-get install -y lxc-docker-${DOCKER_VERSION}
+sudo apt-get install -y docker-engine=${DOCKER_VERSION}
 
 # Download docker containers to the machine to save download time on
 # provisioning later

packer/tests/spec/docker_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
-docker_version = 'lxc-docker-' + ENV['DOCKER_VERSION']
-
-describe package(docker_version) do
-  it { should be_installed }
+describe package('docker-engine') do
+  it { should be_installed.by('apt').with_version(ENV['DOCKER_VERSION']) }
 end
 
 describe package("linux-image-extra-#{`uname -r`.strip}") do

packer/ubuntu-14.04_amd64-amis.json

@@ -3,10 +3,10 @@
     "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
     "aws_secret_key": "{{env `AWS_ACCESS_KEY`}}",
     "mesos_version": "0.23.0-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0",
+    "marathon_version": "v0.9.1",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",
-    "docker_version": "1.7.0",
+    "docker_version": "1.8.1-0~trusty",
     "version": "{{env `APOLLO_VERSION`}}",
     "aws_region": "{{env `AWS_REGION`}}",
     "aws_source_ami": "{{env `AWS_SOURCE_AMI`}}",

packer/ubuntu-14.04_amd64-droplet.json

@@ -5,10 +5,10 @@
     "digitalocean_size": "{{env `DIGITALOCEAN_SIZE`}}",
     "digitalocean_image": "{{env `DIGITALOCEAN_IMAGE`}}",
     "mesos_version": "0.23.0-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0",
+    "marathon_version": "v0.9.1",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",
-    "docker_version": "1.7.0",
+    "docker_version": "1.8.1-0~trusty",
     "version": "{{env `APOLLO_VERSION`}}"
   },
   "builders": [{

packer/ubuntu-14.04_amd64-google.json

@@ -5,10 +5,10 @@
     "source_image": "{{env `GCS_SOURCE_IMAGE`}}",
     "zone": "{{env `GCS_ZONE`}}",
     "mesos_version": "0.23.0-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0",
+    "marathon_version": "v0.9.1",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",
-    "docker_version": "1.7.0",
+    "docker_version": "1.8.1-0~trusty",
     "version": "{{env `APOLLO_VERSION`}}"
   },
   "builders": [{

packer/ubuntu-14.04_amd64.json

@@ -9,13 +9,13 @@
     "hostname": "ubuntu",
     "version": "{{env `APOLLO_VERSION`}}",
     "mesos_version": "0.23.0-1.0.ubuntu1404",
-    "marathon_version": "v0.9.0",
+    "marathon_version": "v0.9.1",
     "consul_version": "0.5.2",
     "weave_version": "1.0.1",
-    "docker_version": "1.7.0",
+    "docker_version": "1.8.1-0~trusty",
     "access_token": "{{env `ATLAS_TOKEN`}}",
-    "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.2-server-amd64.iso",
-    "iso_checksum": "83aabd8dcf1e8f469f3c72fff2375195"
+    "iso_url": "http://releases.ubuntu.com/trusty/ubuntu-14.04.3-server-amd64.iso",
+    "iso_checksum": "9e5fecc94b3925bededed0fdca1bd417"
   },
   "builders": [{
     "type": "virtualbox-iso",

roles/marathon/defaults/main.yml

@@ -2,7 +2,7 @@
 # defaults file for marathon
 marathon_consul_dir: /etc/consul.d
 marathon_enabled: true
-marathon_version: '0.9.0'
+marathon_version: '0.9.1'
 marathon_restart_policy: 'always'
 marathon_net: 'bridge'
 marathon_hostname: "{{ ansible_ssh_host }}"

terraform/aws-public/variables.tf

@@ -76,22 +76,22 @@ variable "atlas_artifact" {
 
 variable "atlas_artifact_version" {
   default = {
-    master = "11"
-    slave  = "11"
+    master = "13"
+    slave  = "13"
   }
 }
 
 /* Remember to update the list every time when you build a new artifact on atlas */
 variable "amis" {
   default = {
-    ap-northeast-1 = "ami-364cfe36"
-    ap-southeast-1 = "ami-54b0bd06"
-    ap-southeast-2 = "ami-79145443"
-    eu-central-1 = "ami-fa7571e7"
-    eu-west-1 = "ami-d67c2ba1"
-    sa-east-1 = "ami-ed72fcf0"
-    us-east-1 = "ami-87d374ec"
-    us-west-1 = "ami-bb3fc3ff"
-    us-west-2 = "ami-5fafa16f"
+    ap-northeast-1 = "ami-dedc5fde"
+    ap-southeast-1 = "ami-8c6e66de"
+    ap-southeast-2 = "ami-316f220b"
+    eu-central-1 = "ami-7eecea63"
+    eu-west-1 = "ami-4c28733b"
+    sa-east-1 = "ami-7743c86a"
+    us-east-1 = "ami-dbe158b0"
+    us-west-1 = "ami-37dc2473"
+    us-west-2 = "ami-b1889e81"
   }
 }

terraform/aws/variables.tf

@@ -90,22 +90,22 @@ variable "atlas_artifact" {
 
 variable "atlas_artifact_version" {
   default = {
-    master = "11"
-    slave  = "11"
+    master = "13"
+    slave  = "13"
   }
 }
 
 /* Remember to update the list every time when you build a new artifact on atlas */
 variable "amis" {
   default = {
-    ap-northeast-1 = "ami-364cfe36"
-    ap-southeast-1 = "ami-54b0bd06"
-    ap-southeast-2 = "ami-79145443"
-    eu-central-1 = "ami-fa7571e7"
-    eu-west-1 = "ami-d67c2ba1"
-    sa-east-1 = "ami-ed72fcf0"
-    us-east-1 = "ami-87d374ec"
-    us-west-1 = "ami-bb3fc3ff"
-    us-west-2 = "ami-5fafa16f"
+    ap-northeast-1 = "ami-dedc5fde"
+    ap-southeast-1 = "ami-8c6e66de"
+    ap-southeast-2 = "ami-316f220b"
+    eu-central-1 = "ami-7eecea63"
+    eu-west-1 = "ami-4c28733b"
+    sa-east-1 = "ami-7743c86a"
+    us-east-1 = "ami-dbe158b0"
+    us-west-1 = "ami-37dc2473"
+    us-west-2 = "ami-b1889e81"
   }
 }