From 47e4a58d90fa627658f8957d2e984b108139474b Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Thu, 18 Oct 2018 12:41:30 +0200 Subject: [PATCH] Explicit specify java version to use to ensure we rebuild image when java version changes. (#8397) Motivation: We should explicit specify the java version to use to ensure docker will rebuild the image once a new java version was released and we specify it. Also we should use openjdk for testing when possible. Modifications: - Explicit specify the java versions to use - Use openjdk when possible. Result: Ensure latest java versions are used during testing --- docker/docker-compose.centos-6.110.yaml | 2 +- docker/docker-compose.centos-6.111.yaml | 2 +- docker/docker-compose.centos-6.112.yaml | 2 +- docker/docker-compose.centos-6.18.yaml | 2 +- docker/docker-compose.centos-6.19.yaml | 2 +- docker/docker-compose.centos-7.110.yaml | 2 +- docker/docker-compose.centos-7.111.yaml | 2 +- docker/docker-compose.centos-7.112.yaml | 2 +- docker/docker-compose.centos-7.18.yaml | 2 +- docker/docker-compose.centos-7.19.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/docker-compose.centos-6.110.yaml b/docker/docker-compose.centos-6.110.yaml index 0db4cfd837..144780de9e 100644 --- a/docker/docker-compose.centos-6.110.yaml +++ b/docker/docker-compose.centos-6.110.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "1.10-0" + java_version : "openjdk@1.10.0-2" test: image: netty:centos-6-1.10 diff --git a/docker/docker-compose.centos-6.111.yaml b/docker/docker-compose.centos-6.111.yaml index 47ddec15f2..12b19d9189 100644 --- a/docker/docker-compose.centos-6.111.yaml +++ b/docker/docker-compose.centos-6.111.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "1.11.0" + java_version : "openjdk@1.11.0-1" test: image: netty:centos-6-1.11 diff --git a/docker/docker-compose.centos-6.112.yaml b/docker/docker-compose.centos-6.112.yaml index 86a97a5ce8..456d603e8f 100644 --- a/docker/docker-compose.centos-6.112.yaml +++ b/docker/docker-compose.centos-6.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "openjdk@1.12.0" + java_version : "openjdk@1.12.0-15" test: image: netty:centos-6-1.12 diff --git a/docker/docker-compose.centos-6.18.yaml b/docker/docker-compose.centos-6.18.yaml index 61b2b6edb1..43817e5c0e 100644 --- a/docker/docker-compose.centos-6.18.yaml +++ b/docker/docker-compose.centos-6.18.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "1.8" + java_version : "1.8.192" test: image: netty:centos-6-1.8 diff --git a/docker/docker-compose.centos-6.19.yaml b/docker/docker-compose.centos-6.19.yaml index 861d9d9e76..93588d6e4e 100644 --- a/docker/docker-compose.centos-6.19.yaml +++ b/docker/docker-compose.centos-6.19.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "6" - java_version : "zulu@1.9.0" + java_version : "openjdk@1.9.0-4" test: image: netty:centos-6-1.9 diff --git a/docker/docker-compose.centos-7.110.yaml b/docker/docker-compose.centos-7.110.yaml index d2004a1b1d..7f165208e1 100644 --- a/docker/docker-compose.centos-7.110.yaml +++ b/docker/docker-compose.centos-7.110.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "1.10-0" + java_version : "openjdk@1.10.0-2" test: image: netty:centos-7-1.10 diff --git a/docker/docker-compose.centos-7.111.yaml b/docker/docker-compose.centos-7.111.yaml index 517f933442..f80a7355e7 100644 --- a/docker/docker-compose.centos-7.111.yaml +++ b/docker/docker-compose.centos-7.111.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "1.11.0" + java_version : "openjdk@1.11.0-1" test: image: netty:centos-7-1.11 diff --git a/docker/docker-compose.centos-7.112.yaml b/docker/docker-compose.centos-7.112.yaml index 627e8d34a0..73bae6fdec 100644 --- a/docker/docker-compose.centos-7.112.yaml +++ b/docker/docker-compose.centos-7.112.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "openjdk@1.12.0" + java_version : "openjdk@1.12.0-15" test: image: netty:centos-7-1.12 diff --git a/docker/docker-compose.centos-7.18.yaml b/docker/docker-compose.centos-7.18.yaml index df3aa0040a..20008caa04 100644 --- a/docker/docker-compose.centos-7.18.yaml +++ b/docker/docker-compose.centos-7.18.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "1.8" + java_version : "1.8.192" test: image: netty:centos-7-1.8 diff --git a/docker/docker-compose.centos-7.19.yaml b/docker/docker-compose.centos-7.19.yaml index 3b61875389..5f1af4f11e 100644 --- a/docker/docker-compose.centos-7.19.yaml +++ b/docker/docker-compose.centos-7.19.yaml @@ -7,7 +7,7 @@ services: build: args: centos_version : "7" - java_version : "zulu@1.9.0" + java_version : "openjdk@1.9.0-4" test: image: netty:centos-7-1.9