From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 9 May 2018 14:41:59 +0000 (-0700)
Subject: Update init Docker image to Ubuntu 16.04
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=fb90a4ac2cdaf3b474295c751fac0b4c4ac88334;p=releng%2Fci-workshop.git

Update init Docker image to Ubuntu 16.04

Include python-setuptools package and organize package list

Change-Id: Ie391a410af309d08d4c9b1a4540ad1389a5548fe
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---

diff --git a/init/Dockerfile b/init/Dockerfile
index 437a759..8f19b38 100644
--- a/init/Dockerfile
+++ b/init/Dockerfile
@@ -8,13 +8,20 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 
 RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update -qq \
     && apt-get install --no-install-recommends -y \
-       curl git python python-pip python-dev libyaml-dev \
-       realpath openssh-client \
+       curl \
+       git \
+       libyaml-dev \
+       openssh-client \
+       python \
+       python-dev \
+       python-pip \
+       python-setuptools \
+       realpath \
     && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /docker-entrypoint-init.d/