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
271
        ;;
271
        ;;
6
272
esac
272
esac
7
273
273
8
274
# Pre-cache docker.io and docker-compose for 15.10 and later
9
275
if dist_ge "${suite}" "wily"; then
10
276
    xchroot apt-get -y install --download-only --install-recommends \
11
277
                        docker-compose docker.io git aufs-tools
12
278
fi
13
279
14
280
#################################################
274
#################################################
15
281
#################################################
275
#################################################
16
282
# Addins if any, including Cloud-configs
276
# Addins if any, including Cloud-configs
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
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
David Krauser (community)	2019-03-15	Approve on 2019-03-20
Robert C Jennings (community)	2019-03-15	Approve on 2019-03-20
Review via email: mp+364491@code.launchpad.net