honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Use LTS version of Ubuntu in Dockerfiles (#55327)" 

This reverts commit dd76fbac60.
This commit is contained in:
Rory Hunter 2020-04-16 20:05:22 +01:00
parent dd76fbac60
commit 49f8f66a41
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update -qqy RUN apt-get update -qqy
RUN apt-get install -qqy openjdk-12-jre-headless RUN apt-get install -qqy openjdk-12-jre-headless
@ -14,4 +14,4 @@ ENV GCS_FIXTURE_TOKEN=${token}
ENTRYPOINT exec java -classpath "/fixture/shared/*" \ ENTRYPOINT exec java -classpath "/fixture/shared/*" \
fixture.gcs.GoogleCloudStorageHttpFixture 0.0.0.0 "$GCS_FIXTURE_PORT" "$GCS_FIXTURE_BUCKET" "$GCS_FIXTURE_TOKEN" fixture.gcs.GoogleCloudStorageHttpFixture 0.0.0.0 "$GCS_FIXTURE_PORT" "$GCS_FIXTURE_BUCKET" "$GCS_FIXTURE_TOKEN"
EXPOSE $port EXPOSE $port

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

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:19.04
RUN apt-get update -qqy RUN apt-get update -qqy
RUN apt-get install -qqy openjdk-12-jre-headless RUN apt-get install -qqy openjdk-12-jre-headless

2
x-pack/test/smb-fixture/Dockerfile
View File

@ -1,4 +1,4 @@
FROM ubuntu:18.04 FROM ubuntu:16.04
RUN apt-get update -qqy && apt-get install -qqy samba ldap-utils RUN apt-get update -qqy && apt-get install -qqy samba ldap-utils
ADD . /fixture ADD . /fixture
RUN chmod +x /fixture/src/main/resources/provision/installsmb.sh RUN chmod +x /fixture/src/main/resources/provision/installsmb.sh