honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-25 09:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use LTS version of Ubuntu in Dockerfiles (#55370)

Browse Source 
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.
This commit is contained in:
Rory Hunter 2020-04-17 21:13:45 +01:00 committed by Jason Tedor
parent 66071b2f6e
commit a5b545b2a0
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/fixtures/azure-fixture/Dockerfile vendored
View File

@ -1,5 +1,5 @@
FROM ubuntu:19.04
FROM ubuntu:18.04
RUN apt-get update -qqy
RUN apt-get install -qqy openjdk-12-jre-headless
RUN apt-get install -qqy openjdk-11-jre-headless
ENTRYPOINT exec java -classpath "/fixture/shared/*" fixture.azure.AzureHttpFixture 0.0.0.0 8091 container
EXPOSE 8091

6
test/fixtures/gcs-fixture/Dockerfile vendored
View File

@ -1,7 +1,7 @@
FROM ubuntu:19.04
FROM ubuntu:18.04
RUN apt-get update -qqy
RUN apt-get install -qqy openjdk-12-jre-headless
RUN apt-get install -qqy openjdk-11-jre-headless
ARG port
ARG bucket
@ -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

4
test/fixtures/s3-fixture/Dockerfile vendored
View File

@ -1,7 +1,7 @@
FROM ubuntu:19.04
FROM ubuntu:18.04
RUN apt-get update -qqy
RUN apt-get install -qqy openjdk-12-jre-headless
RUN apt-get install -qqy openjdk-11-jre-headless
ARG fixtureClass
ARG port