[flink-docker] branch dev-master updated: [FLINK-25251] Use Java 11 by default

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch dev-master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git


The following commit(s) were added to refs/heads/dev-master by this push:
     new 646d4f4  [FLINK-25251] Use Java 11 by default
646d4f4 is described below

commit 646d4f47fcaec03c2fd2d78f03b156b31cf0ee34
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Dec 14 16:17:52 2021 +0100

    [FLINK-25251] Use Java 11 by default
---
 add-custom.sh               | 4 ++--
 generator.sh                | 2 +-
 testing/run_travis_tests.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/add-custom.sh b/add-custom.sh
index e8e2a5e..8b9dc59 100755
--- a/add-custom.sh
+++ b/add-custom.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -eu
 
 # Use this script to build the Dockerfiles against an arbitrary
 # Flink distribution.
@@ -12,7 +12,7 @@ function usage() {
 
 binary_download_url=
 name=custom
-java_version=8
+java_version=${DEFAULT_JAVA}
 
 while getopts u:n:j:h arg; do
   case "$arg" in
diff --git a/generator.sh b/generator.sh
index 3eb7b2b..e2a02f7 100644
--- a/generator.sh
+++ b/generator.sh
@@ -3,7 +3,7 @@
 export SOURCE_VARIANTS=(debian )
 
 export DEFAULT_SCALA="2.12"
-export DEFAULT_JAVA="8"
+export DEFAULT_JAVA="11"
 
 function generateDockerfile {
     # define variables
diff --git a/testing/run_travis_tests.sh b/testing/run_travis_tests.sh
index 244a0ae..83be81b 100755
--- a/testing/run_travis_tests.sh
+++ b/testing/run_travis_tests.sh
@@ -13,7 +13,7 @@ BRANCH="$TRAVIS_BRANCH"
 
 test_docker_entrypoint
 
-./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.15-SNAPSHOT-bin-scala_2.11.tgz" -n test-java8
+./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.15-SNAPSHOT-bin-scala_2.11.tgz" -j 8 -n test-java8
 
 # test Flink with Java11 image as well
 ./add-custom.sh -u "https://s3.amazonaws.com/flink-nightly/flink-1.15-SNAPSHOT-bin-scala_2.11.tgz" -j 11 -n test-java11