Skip to content

Commit 3992341

Browse files
pugnascotiajasontedor
authored andcommitted
Use LTS version of Ubuntu in Dockerfiles (#55370)
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. This also requires a switch from OpenJDK 12 to 11. Also change a usage of 16.04 to 18.04, for consistency.
1 parent acab325 commit 3992341

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM ubuntu:19.04
1+
FROM ubuntu:18.04
22
RUN apt-get update -qqy
3-
RUN apt-get install -qqy openjdk-12-jre-headless
3+
RUN apt-get install -qqy openjdk-11-jre-headless
44
ENTRYPOINT exec java -classpath "/fixture/shared/*" fixture.azure.AzureHttpFixture 0.0.0.0 8091 container
55
EXPOSE 8091

test/fixtures/gcs-fixture/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM ubuntu:19.04
1+
FROM ubuntu:18.04
22

33
RUN apt-get update -qqy
4-
RUN apt-get install -qqy openjdk-12-jre-headless
4+
RUN apt-get install -qqy openjdk-11-jre-headless
55

66
ARG port
77
ARG bucket
@@ -14,4 +14,4 @@ ENV GCS_FIXTURE_TOKEN=${token}
1414
ENTRYPOINT exec java -classpath "/fixture/shared/*" \
1515
fixture.gcs.GoogleCloudStorageHttpFixture 0.0.0.0 "$GCS_FIXTURE_PORT" "$GCS_FIXTURE_BUCKET" "$GCS_FIXTURE_TOKEN"
1616

17-
EXPOSE $port
17+
EXPOSE $port

test/fixtures/s3-fixture/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM ubuntu:19.04
1+
FROM ubuntu:18.04
22

33
RUN apt-get update -qqy
4-
RUN apt-get install -qqy openjdk-12-jre-headless
4+
RUN apt-get install -qqy openjdk-11-jre-headless
55

66
ARG fixtureClass
77
ARG port

0 commit comments

Comments
 (0)