[flink-docker] branch dev-1.14 updated: [FLINK-29137] Switch to Eclipse Temurin

[chesnay]

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

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


The following commit(s) were added to refs/heads/dev-1.14 by this push:
     new d7e30b2  [FLINK-29137] Switch to Eclipse Temurin
d7e30b2 is described below

commit d7e30b225208ee63ecbc364433f7ae4103c17689
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Tue Aug 30 10:25:37 2022 +0200

    [FLINK-29137] Switch to Eclipse Temurin
---
 Dockerfile-debian.template => Dockerfile-ubuntu.template | 2 +-
 generator.sh                                             | 4 ++--
 testing/testing_lib.sh                                   | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Dockerfile-debian.template b/Dockerfile-ubuntu.template
similarity index 97%
rename from Dockerfile-debian.template
rename to Dockerfile-ubuntu.template
index 4aa6b5f..04fce5a 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-ubuntu.template
@@ -21,7 +21,7 @@ FROM %%FROM_IMAGE%%
 # Install dependencies
 RUN set -ex; \
   apt-get update; \
-  apt-get -y install libsnappy1v5 gettext-base libjemalloc-dev; \
+  apt-get -y install gpg libsnappy1v5 gettext-base libjemalloc-dev; \
   rm -rf /var/lib/apt/lists/*
 
 # Grab gosu for easy step-down from root
diff --git a/generator.sh b/generator.sh
index 94d7550..f2b27f5 100644
--- a/generator.sh
+++ b/generator.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export SOURCE_VARIANTS=(debian )
+export SOURCE_VARIANTS=(ubuntu )
 
 export DEFAULT_SCALA="2.12"
 export DEFAULT_JAVA="8"
@@ -15,7 +15,7 @@ function generateDockerfile {
     java_version=$6
     source_variant=$7
 
-    from_docker_image="openjdk:${java_version}-jre"
+    from_docker_image="eclipse-temurin:${java_version}-jre-jammy"
 
     cp docker-entrypoint.sh "$dir/docker-entrypoint.sh"
 
diff --git a/testing/testing_lib.sh b/testing/testing_lib.sh
index f964950..d1a7ff3 100644
--- a/testing/testing_lib.sh
+++ b/testing/testing_lib.sh
@@ -235,13 +235,10 @@ function smoke_test_one_image() {
     internal_smoke_test_images "$(ls ./*/*/Dockerfile | tail -n 1)" ""
 }
 
-# Similar to smoke_test_one_image, but test one debian image and one alpine 
image running as a
-# non-root user.
+# Similar to smoke_test_one_image, but test as a non-root user.
 function smoke_test_one_image_non_root() {
     echo >&2 "==> Test images running as non-root"
-    local dockerfiles="$dockerfiles $(ls ./*/*-debian/Dockerfile | tail -n 1)"
-    dockerfiles="$dockerfiles $(ls ./*/*-alpine/Dockerfile | tail -n 1)"
-    internal_smoke_test_images "$dockerfiles" "--user flink"
+    internal_smoke_test_images "$(ls ./*/*/Dockerfile | tail -n 1)" "--user 
flink"
 }
 
 function test_docker_entrypoint() {