From fbb42a292fb9ecf8ddbd235c62edd9e745ab659e Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Fri, 16 Oct 2020 11:33:06 +0200 Subject: [PATCH] Add docker-compose files to compile with OpenJDK15 (#10697) Motivation: OpenJDK15 was released, we should compile with it on the CI Modifications: Add docker-compose files to be able to compile with OpenJDK15 Result: Compile with latest major JDK version --- docker/docker-compose.centos-6.115.yaml | 24 ++++++++++++++++++++++++ docker/docker-compose.centos-7.115.yaml | 22 ++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 docker/docker-compose.centos-6.115.yaml create mode 100644 docker/docker-compose.centos-7.115.yaml diff --git a/docker/docker-compose.centos-6.115.yaml b/docker/docker-compose.centos-6.115.yaml new file mode 100644 index 0000000000..a516806b25 --- /dev/null +++ b/docker/docker-compose.centos-6.115.yaml @@ -0,0 +1,24 @@ +version: "3" + +services: + + runtime-setup: + image: netty:centos-6-1.15 + build: + args: + centos_version : "6" + # use zulu and not adoptjdk for now as adoptjdk15 does not support centos6 + # https://github.com/AdoptOpenJDK/openjdk-build/issues/2097 + java_version : "zulu@1.15.0-0" + + test: + image: netty:centos-6-1.15 + + test-leak: + image: netty:centos-6-1.15 + + test-boringssl-static: + image: netty:centos-6-1.15 + + shell: + image: netty:centos-6-1.15 diff --git a/docker/docker-compose.centos-7.115.yaml b/docker/docker-compose.centos-7.115.yaml new file mode 100644 index 0000000000..07a1513aa1 --- /dev/null +++ b/docker/docker-compose.centos-7.115.yaml @@ -0,0 +1,22 @@ +version: "3" + +services: + + runtime-setup: + image: netty:centos-7-1.15 + build: + args: + centos_version : "7" + java_version : "adopt@1.15.0-0" + + test: + image: netty:centos-7-1.15 + + test-leak: + image: netty:centos-7-1.15 + + test-boringssl-static: + image: netty:centos-7-1.15 + + shell: + image: netty:centos-7-1.15