From dd76fbac608c044ea121dcd013572cd6790437f0 Mon Sep 17 00:00:00 2001
From: Rory Hunter <pugnascotia@users.noreply.github.com>
Date: Thu, 16 Apr 2020 19:46:21 +0100
Subject: [PATCH] Use LTS version of Ubuntu in Dockerfiles (#55327)

We have some Dockerfiles that reference Ubuntu 19.04, which is not an LTS
version and has now appears to have been retired from the Ubuntu repositories.
Switch to 18.04, which is the current long-term support version. Also change a
usage of 16.04 to 18.04, for consistency.
---
 test/fixtures/azure-fixture/Dockerfile | 2 +-
 test/fixtures/gcs-fixture/Dockerfile   | 4 ++--
 test/fixtures/s3-fixture/Dockerfile    | 2 +-
 x-pack/test/smb-fixture/Dockerfile     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/fixtures/azure-fixture/Dockerfile b/test/fixtures/azure-fixture/Dockerfile
index 763a81761cd4c..30faed4773241 100644
--- a/test/fixtures/azure-fixture/Dockerfile
+++ b/test/fixtures/azure-fixture/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.04
+FROM ubuntu:18.04
 RUN apt-get update -qqy
 RUN apt-get install -qqy openjdk-12-jre-headless
 ENTRYPOINT exec java -classpath "/fixture/shared/*" fixture.azure.AzureHttpFixture 0.0.0.0 8091 container
diff --git a/test/fixtures/gcs-fixture/Dockerfile b/test/fixtures/gcs-fixture/Dockerfile
index 52e0d31888f0c..daae63295b617 100644
--- a/test/fixtures/gcs-fixture/Dockerfile
+++ b/test/fixtures/gcs-fixture/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.04
+FROM ubuntu:18.04
 
 RUN apt-get update -qqy
 RUN apt-get install -qqy openjdk-12-jre-headless
@@ -14,4 +14,4 @@ ENV GCS_FIXTURE_TOKEN=${token}
 ENTRYPOINT exec java -classpath "/fixture/shared/*" \
     fixture.gcs.GoogleCloudStorageHttpFixture 0.0.0.0 "$GCS_FIXTURE_PORT" "$GCS_FIXTURE_BUCKET" "$GCS_FIXTURE_TOKEN"
 
-EXPOSE $port
\ No newline at end of file
+EXPOSE $port
diff --git a/test/fixtures/s3-fixture/Dockerfile b/test/fixtures/s3-fixture/Dockerfile
index c1f2515ae3504..f24aa03505c6f 100644
--- a/test/fixtures/s3-fixture/Dockerfile
+++ b/test/fixtures/s3-fixture/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:19.04
+FROM ubuntu:18.04
 
 RUN apt-get update -qqy
 RUN apt-get install -qqy openjdk-12-jre-headless
diff --git a/x-pack/test/smb-fixture/Dockerfile b/x-pack/test/smb-fixture/Dockerfile
index bcd74758ff496..cfbc26f21dfe2 100644
--- a/x-pack/test/smb-fixture/Dockerfile
+++ b/x-pack/test/smb-fixture/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN apt-get update -qqy && apt-get install -qqy samba ldap-utils
 ADD . /fixture
 RUN chmod +x /fixture/src/main/resources/provision/installsmb.sh