From 04d6736e89ec48a338e0499ead55b71b8d678db1 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Tue, 14 Jun 2016 21:50:04 +0800
Subject: Pin to Ubuntu 16.04

Upgrade Ubuntu base image to Xenial

Closes-Bug: #1593599
Change-Id: I5832a729a9a4fa73c02442047c92ba088ce20db3
---
 docker/base/Dockerfile.j2 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker/base/Dockerfile.j2')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 864ec2adb..22a6278f4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -202,15 +202,17 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
 {% set base_apt_packages = [
    'curl',
    'gawk',
+   'kmod',
    'lvm2',
    'open-iscsi',
    'python',
+   'sudo',
    'tgt']
 %}
 
 {% if base_distro == 'ubuntu' %}
     {% set base_apt_keys = [
-      '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB',
+      '0xF1656F24C74CD1D8',
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
       '08B73419AC32B4E966C1A330E84AC2C0460F3994',
-- 
cgit v1.2.3