You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/08/31 09:13:48 UTC
[flink-docker] branch dev-master updated (ed004f8 -> 47747fa)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch dev-master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
from ed004f8 Fix LD_PRELOAD on ARM images
new 5ef2f66 [hotfix] Remove empty lines in RUN statements
new 47747fa [FLINK-29137] Switch to Eclipse Temurin
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Dockerfile-debian.template => Dockerfile-ubuntu.template | 4 ++--
generator.sh | 4 ++--
testing/testing_lib.sh | 7 ++-----
3 files changed, 6 insertions(+), 9 deletions(-)
rename Dockerfile-debian.template => Dockerfile-ubuntu.template (98%)
[flink-docker] 02/02: [FLINK-29137] Switch to Eclipse Temurin
Posted by 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
commit 47747fa25eeccbbea31c11b6a8bfe957c490a91c
Author: Chesnay Schepler <ch...@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 98%
rename from Dockerfile-debian.template
rename to Dockerfile-ubuntu.template
index e338e89..7073eec 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 e093835..758812a 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="11"
@@ -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() {
[flink-docker] 01/02: [hotfix] Remove empty lines in RUN statements
Posted by 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
commit 5ef2f66823900fe53125fec7ae63739685538e7c
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Tue Aug 30 10:37:38 2022 +0200
[hotfix] Remove empty lines in RUN statements
These will be treated as errors in the future.
---
Dockerfile-debian.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 545ab85..e338e89 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -79,7 +79,7 @@ RUN set -ex; \
rm flink.tgz; \
\
chown -R flink:flink .; \
-
+ \
# Replace default REST/RPC endpoint bind address to use the container's network interface \
sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \
sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \