Merge lp:~daniel-thewatkins/vmbuilder/jenkins_kvm-azure-docker into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Dan Watkins on 2017-02-17
Status: Merged
Merged at revision: 785
Proposed branch: lp:~daniel-thewatkins/vmbuilder/jenkins_kvm-azure-docker
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 12 lines (+1/-1)
1 file modified
templates/img-azure.tmpl (+1/-1)
To merge this branch: bzr merge lp:~daniel-thewatkins/vmbuilder/jenkins_kvm-azure-docker
Reviewer Review Type Date Requested Status
Philip Roche 2017-02-17 Approve on 2017-02-17
Jose L. VG (community) 2017-02-17 Approve on 2017-02-17
Review via email: mp+317604@code.launchpad.net
To post a comment you must log in.
Jose L. VG (josvaz) wrote :

LGTM!

Doing:
sudo apt-get -y install --download-only --install-recommends docker-compose docker.io git aufs-tools

renders:
https://pastebin.canonical.com/179826/

Which includes:
Get:3 http://es.archive.ubuntu.com/ubuntu yakkety/universe amd64 cgroupfs-mount all 1.3 [5.778 B]

review: Approve
Philip Roche (philroche) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/img-azure.tmpl'
2--- templates/img-azure.tmpl 2016-12-19 14:59:16 +0000
3+++ templates/img-azure.tmpl 2017-02-17 11:22:14 +0000
4@@ -249,7 +249,7 @@
5 # Pre-cache docker.io and docker-compose for 15.10 and later
6 if dist_ge "${suite}" "wily"; then
7 xchroot apt-get -y install --download-only --install-recommends \
8- docker-compose docker.io git aufs-tools cgroup-lite
9+ docker-compose docker.io git aufs-tools
10 fi
11
12 #################################################

Subscribers

People subscribed via source and target branches