Skip to content

Commit

Permalink
Use LTS version of Ubuntu in Dockerfiles (#55327)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
pugnascotia committed Apr 16, 2020
1 parent cf5278f commit dd76fba
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion test/fixtures/azure-fixture/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/fixtures/gcs-fixture/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
EXPOSE $port
2 changes: 1 addition & 1 deletion test/fixtures/s3-fixture/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/smb-fixture/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit dd76fba

Please sign in to comment.