Skip to content

Commit 8dc6a3d

Browse files
committed
Bundle AdoptOpenJDK 13 (#46860)
This commit switches to use AdoptOpenJDK 13 for bundling the JDK, instead of Oracle OpenJDK 13.
1 parent c4082b6 commit 8dc6a3d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

distribution/docker/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ ext.expansions = { oss, local ->
2323
'build_date' : project.buildDate,
2424
'elasticsearch' : elasticsearch,
2525
'git_revision' : project.gitRevision,
26-
'jdkUrl' : 'https://download.java.net/java/GA/jdk13/5b8a42f3905b406298b72d750b6919f6/33/GPL/openjdk-13_linux-x64_bin.tar.gz',
27-
'jdkVersion' : '13',
26+
'jdkUrl' : 'https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13%2B33/OpenJDK13U-jdk_x64_linux_hotspot_13_33.tar.gz',
27+
'jdkVersion' : '13+33',
2828
'license' : oss ? 'Apache-2.0' : 'Elastic-License',
2929
'source_elasticsearch': local ? "COPY $elasticsearch /opt/" : "RUN cd /opt && curl --retry 8 -s -L -O https://artifacts.elastic.co/downloads/elasticsearch/${elasticsearch} && cd -",
3030
'version' : VersionProperties.elasticsearch

distribution/docker/src/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FROM centos:7 AS builder
1616
ENV PATH /usr/share/elasticsearch/bin:$PATH
1717
ENV JAVA_HOME /opt/jdk-${jdkVersion}
1818

19-
RUN curl --retry 8 -s ${jdkUrl} | tar -C /opt -zxf -
19+
RUN curl -L --retry 8 -s ${jdkUrl} | tar -C /opt -zxf -
2020

2121
# Replace OpenJDK's built-in CA certificate keystore with the one from the OS
2222
# vendor. The latter is superior in several ways.

0 commit comments

Comments
 (0)