Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-drop-docker-preload into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

Proposed by Tobias Koch on 2019-03-15
Status: Merged
Merged at revision: 819
Proposed branch: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-drop-docker-preload
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 16 lines (+0/-6)
1 file modified
templates/img-azure.tmpl (+0/-6)
To merge this branch: bzr merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-drop-docker-preload
Reviewer Review Type Date Requested Status
David Krauser 2019-03-15 Approve on 2019-03-20
Robert C Jennings 2019-03-15 Approve on 2019-03-20
Review via email: mp+364491@code.launchpad.net

Commit message

Drop pre-caching of docker.io and docker-compose

To post a comment you must log in.
Tobias Koch (tobijk) wrote :

See #00217448

Robert C Jennings (rcj) wrote :

+1

Robert C Jennings (rcj) :
review: Approve
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 2018-10-14 21:43:12 +0000
3+++ templates/img-azure.tmpl 2019-03-15 10:06:57 +0000
4@@ -271,12 +271,6 @@
5 ;;
6 esac
7
8-# Pre-cache docker.io and docker-compose for 15.10 and later
9-if dist_ge "${suite}" "wily"; then
10- xchroot apt-get -y install --download-only --install-recommends \
11- docker-compose docker.io git aufs-tools
12-fi
13-
14 #################################################
15 #################################################
16 # Addins if any, including Cloud-configs

Subscribers

People subscribed via source and target branches

to all changes: