github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-06-28 09:46:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

moved to openjdk 11 in docker testing (#10563)

Browse source 
- also fix javadoc warning when building on jdk11
This commit is contained in:
João Duarte 2019-04-15 21:13:05 +01:00 • committed by GitHub
parent 1d5f9e0bca
commit c657f90362
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -1,8 +1,8 @@
FROM ubuntu:xenial FROM ubuntu:bionic
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev \ apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev \
libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \ libxml2-dev libxslt-dev openjdk-11-jdk-headless curl iputils-ping netcat && \
apt-get clean apt-get clean
WORKDIR /root WORKDIR /root

4
Dockerfile.base
View file

@ -1,9 +1,9 @@
#logstash-base image, use ci/docker_update_base_image.sh to push updates #logstash-base image, use ci/docker_update_base_image.sh to push updates
FROM ubuntu:xenial FROM ubuntu:bionic
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev \ apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev \
libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \ libxml2-dev libxslt-dev openjdk-11-jdk-headless curl iputils-ping netcat && \
apt-get clean apt-get clean
WORKDIR /root WORKDIR /root

3
build.gradle
View file

@ -38,6 +38,9 @@ allprojects {
tasks.withType(Javadoc) { tasks.withType(Javadoc) {
options.addStringOption("Xwerror", "-quiet") options.addStringOption("Xwerror", "-quiet")
if (JavaVersion.current().compareTo(JavaVersion.VERSION_1_9) > 0) {
options.addBooleanOption("html5", true)
}
} }
clean { clean {

2
docker/templates/Dockerfile.j2
View file

@ -10,7 +10,7 @@ FROM centos:7
# Install Java and the "which" command, which is needed by Logstash's shell # Install Java and the "which" command, which is needed by Logstash's shell
# scripts. # scripts.
RUN yum update -y && yum install -y java-1.8.0-openjdk-devel which && \ RUN yum update -y && yum install -y java-11-openjdk-devel which && \
yum clean all yum clean all
# Provide a non-root user to run the process. # Provide a non-root user to run the process.