From a6c078c7fb1cb87c94314ae5074a60d0628362ad Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Wed, 7 Jun 2017 15:54:01 +0100
Subject: [PATCH] Add tzdata back (#25433)

It appears that the base Docker images have removed tzdata.
We use tzdata in the debconf tests, so add it back.
---
 test/utils/docker/ubuntu1204/Dockerfile    | 1 +
 test/utils/docker/ubuntu1404/Dockerfile    | 1 +
 test/utils/docker/ubuntu1604/Dockerfile    | 1 +
 test/utils/docker/ubuntu1604py3/Dockerfile | 1 +
 4 files changed, 4 insertions(+)

diff --git a/test/utils/docker/ubuntu1204/Dockerfile b/test/utils/docker/ubuntu1204/Dockerfile
index 99efce4998..1296e688f9 100644
--- a/test/utils/docker/ubuntu1204/Dockerfile
+++ b/test/utils/docker/ubuntu1204/Dockerfile
@@ -45,6 +45,7 @@ RUN apt-get update -y && \
     rubygems \
     subversion \
     sudo \
+    tzdata \
     unzip \
     xsltproc \
     zip \
diff --git a/test/utils/docker/ubuntu1404/Dockerfile b/test/utils/docker/ubuntu1404/Dockerfile
index 4a61e44bf2..cbf6a19325 100644
--- a/test/utils/docker/ubuntu1404/Dockerfile
+++ b/test/utils/docker/ubuntu1404/Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update -y && \
     ruby \
     subversion \
     sudo \
+    tzdata \
     unzip \
     xsltproc \
     zip \
diff --git a/test/utils/docker/ubuntu1604/Dockerfile b/test/utils/docker/ubuntu1604/Dockerfile
index 0e04c0e9ee..101cbdaab9 100644
--- a/test/utils/docker/ubuntu1604/Dockerfile
+++ b/test/utils/docker/ubuntu1604/Dockerfile
@@ -46,6 +46,7 @@ RUN apt-get update -y && \
     ruby \
     subversion \
     sudo \
+    tzdata \
     unzip \
     virtualenv \
     xsltproc \
diff --git a/test/utils/docker/ubuntu1604py3/Dockerfile b/test/utils/docker/ubuntu1604py3/Dockerfile
index 89ab6f9ac1..2e9d46d4e0 100644
--- a/test/utils/docker/ubuntu1604py3/Dockerfile
+++ b/test/utils/docker/ubuntu1604py3/Dockerfile
@@ -42,6 +42,7 @@ RUN apt-get update -y && \
     ruby \
     subversion \
     sudo \
+    tzdata \
     unzip \
     virtualenv \
     xsltproc \