This is an automated email from the ASF dual-hosted git repository.
dannycranmer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
The following commit(s) were added to refs/heads/master by this push:
new 678f871 Update Dockerfiles for 1.15.2 release (#128)
678f871 is described below
commit 678f87145c86a0f7962bb05b21176a99c986eb02
Author: Danny Cranmer <dannycran...@apache.org>
AuthorDate: Wed Aug 24 15:08:09 2022 +0100
Update Dockerfiles for 1.15.2 release (#128)
---
1.15/scala_2.12-java11-debian/Dockerfile | 6 +++---
1.15/scala_2.12-java11-debian/docker-entrypoint.sh | 15 ++++++++++++++-
1.15/scala_2.12-java11-debian/release.metadata | 2 +-
1.15/scala_2.12-java8-debian/Dockerfile | 6 +++---
1.15/scala_2.12-java8-debian/docker-entrypoint.sh | 15 ++++++++++++++-
1.15/scala_2.12-java8-debian/release.metadata | 2 +-
6 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/1.15/scala_2.12-java11-debian/Dockerfile
b/1.15/scala_2.12-java11-debian/Dockerfile
index 1ba473e..681bc77 100644
--- a/1.15/scala_2.12-java11-debian/Dockerfile
+++ b/1.15/scala_2.12-java11-debian/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
gosu nobody true
# Configure Flink version
-ENV
FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.15.1/flink-1.15.1-bin-scala_2.12.tgz
\
-
FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.15.1/flink-1.15.1-bin-scala_2.12.tgz.asc
\
- GPG_KEY=7D660377995CA7A5AFEBA79A3EE012FEE982F098 \
+ENV
FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.15.2/flink-1.15.2-bin-scala_2.12.tgz
\
+
FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.15.2/flink-1.15.2-bin-scala_2.12.tgz.asc
\
+ GPG_KEY=0F79F2AFB2351BC29678544591F9C1EC125FD8DB \
CHECK_GPG=true
# Prepare environment
diff --git a/1.15/scala_2.12-java11-debian/docker-entrypoint.sh
b/1.15/scala_2.12-java11-debian/docker-entrypoint.sh
index 84fca0c..8b0350e 100755
--- a/1.15/scala_2.12-java11-debian/docker-entrypoint.sh
+++ b/1.15/scala_2.12-java11-debian/docker-entrypoint.sh
@@ -91,7 +91,20 @@ prepare_configuration() {
maybe_enable_jemalloc() {
if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ JEMALLOC_PATH="/usr/lib/$(uname -m)-linux-gnu/libjemalloc.so"
+ JEMALLOC_FALLBACK="/usr/lib/x86_64-linux-gnu/libjemalloc.so"
+ if [ -f "$JEMALLOC_PATH" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:$JEMALLOC_PATH
+ elif [ -f "$JEMALLOC_FALLBACK" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:$JEMALLOC_FALLBACK
+ else
+ if [ "$JEMALLOC_PATH" = "$JEMALLOC_FALLBACK" ]; then
+ MSG_PATH=$JEMALLOC_PATH
+ else
+ MSG_PATH="$JEMALLOC_PATH and $JEMALLOC_FALLBACK"
+ fi
+ echo "WARNING: attempted to load jemalloc from $MSG_PATH but the
library couldn't be found. glibc will be used instead."
+ fi
fi
}
diff --git a/1.15/scala_2.12-java11-debian/release.metadata
b/1.15/scala_2.12-java11-debian/release.metadata
index b95ca8a..756ff61 100644
--- a/1.15/scala_2.12-java11-debian/release.metadata
+++ b/1.15/scala_2.12-java11-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.15.1-scala_2.12-java11, 1.15-scala_2.12-java11, scala_2.12-java11,
1.15.1-scala_2.12, 1.15-scala_2.12, scala_2.12, 1.15.1-java11, 1.15-java11,
java11, 1.15.1, 1.15, latest
+Tags: 1.15.2-scala_2.12-java11, 1.15-scala_2.12-java11, scala_2.12-java11,
1.15.2-scala_2.12, 1.15-scala_2.12, scala_2.12, 1.15.2-java11, 1.15-java11,
java11, 1.15.2, 1.15, latest
Architectures: amd64,arm64v8
diff --git a/1.15/scala_2.12-java8-debian/Dockerfile
b/1.15/scala_2.12-java8-debian/Dockerfile
index 5fcb32c..8bc18cb 100644
--- a/1.15/scala_2.12-java8-debian/Dockerfile
+++ b/1.15/scala_2.12-java8-debian/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
gosu nobody true
# Configure Flink version
-ENV
FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.15.1/flink-1.15.1-bin-scala_2.12.tgz
\
-
FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.15.1/flink-1.15.1-bin-scala_2.12.tgz.asc
\
- GPG_KEY=7D660377995CA7A5AFEBA79A3EE012FEE982F098 \
+ENV
FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.15.2/flink-1.15.2-bin-scala_2.12.tgz
\
+
FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.15.2/flink-1.15.2-bin-scala_2.12.tgz.asc
\
+ GPG_KEY=0F79F2AFB2351BC29678544591F9C1EC125FD8DB \
CHECK_GPG=true
# Prepare environment
diff --git a/1.15/scala_2.12-java8-debian/docker-entrypoint.sh
b/1.15/scala_2.12-java8-debian/docker-entrypoint.sh
index 84fca0c..8b0350e 100755
--- a/1.15/scala_2.12-java8-debian/docker-entrypoint.sh
+++ b/1.15/scala_2.12-java8-debian/docker-entrypoint.sh
@@ -91,7 +91,20 @@ prepare_configuration() {
maybe_enable_jemalloc() {
if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ JEMALLOC_PATH="/usr/lib/$(uname -m)-linux-gnu/libjemalloc.so"
+ JEMALLOC_FALLBACK="/usr/lib/x86_64-linux-gnu/libjemalloc.so"
+ if [ -f "$JEMALLOC_PATH" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:$JEMALLOC_PATH
+ elif [ -f "$JEMALLOC_FALLBACK" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:$JEMALLOC_FALLBACK
+ else
+ if [ "$JEMALLOC_PATH" = "$JEMALLOC_FALLBACK" ]; then
+ MSG_PATH=$JEMALLOC_PATH
+ else
+ MSG_PATH="$JEMALLOC_PATH and $JEMALLOC_FALLBACK"
+ fi
+ echo "WARNING: attempted to load jemalloc from $MSG_PATH but the
library couldn't be found. glibc will be used instead."
+ fi
fi
}
diff --git a/1.15/scala_2.12-java8-debian/release.metadata
b/1.15/scala_2.12-java8-debian/release.metadata
index 2d87c26..242c411 100644
--- a/1.15/scala_2.12-java8-debian/release.metadata
+++ b/1.15/scala_2.12-java8-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.15.1-scala_2.12-java8, 1.15-scala_2.12-java8, scala_2.12-java8,
1.15.1-java8, 1.15-java8, java8
+Tags: 1.15.2-scala_2.12-java8, 1.15-scala_2.12-java8, scala_2.12-java8,
1.15.2-java8, 1.15-java8, java8
Architectures: amd64,arm64v8
