You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2021/01/26 18:16:56 UTC
[flink-docker] branch master updated: Go back to Flink 1.12.0
This is an automated email from the ASF dual-hosted git repository.
rmetzger 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 4d7cb30 Go back to Flink 1.12.0
4d7cb30 is described below
commit 4d7cb3068d670bef274975c9412d5e40317fba3f
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Tue Jan 26 13:32:55 2021 +0100
Go back to Flink 1.12.0
---
1.12/scala_2.11-java11-debian/Dockerfile | 6 +-
1.12/scala_2.11-java11-debian/docker-entrypoint.sh | 66 ++++++----------------
1.12/scala_2.11-java11-debian/release.metadata | 2 +-
1.12/scala_2.11-java8-debian/Dockerfile | 6 +-
1.12/scala_2.11-java8-debian/docker-entrypoint.sh | 66 ++++++----------------
1.12/scala_2.11-java8-debian/release.metadata | 2 +-
1.12/scala_2.12-java11-debian/Dockerfile | 6 +-
1.12/scala_2.12-java11-debian/docker-entrypoint.sh | 66 ++++++----------------
1.12/scala_2.12-java11-debian/release.metadata | 2 +-
1.12/scala_2.12-java8-debian/Dockerfile | 6 +-
1.12/scala_2.12-java8-debian/docker-entrypoint.sh | 66 ++++++----------------
1.12/scala_2.12-java8-debian/release.metadata | 2 +-
12 files changed, 84 insertions(+), 212 deletions(-)
diff --git a/1.12/scala_2.11-java11-debian/Dockerfile b/1.12/scala_2.11-java11-debian/Dockerfile
index 9b393e2..70310d6 100644
--- a/1.12/scala_2.11-java11-debian/Dockerfile
+++ b/1.12/scala_2.11-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.12.1/flink-1.12.1-bin-scala_2.11.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.1/flink-1.12.1-bin-scala_2.11.tgz.asc \
- GPG_KEY=F8E419AA0B60C28879E876859DFF40967ABFC5A4 \
+ENV FLINK_TGZ_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.11.tgz \
+ FLINK_ASC_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.11.tgz.asc \
+ GPG_KEY=43CE299BC305AFF8B912AA95183F6944D9839159 \
CHECK_GPG=true
# Prepare environment
diff --git a/1.12/scala_2.11-java11-debian/docker-entrypoint.sh b/1.12/scala_2.11-java11-debian/docker-entrypoint.sh
index 65f8fc8..275488e 100755
--- a/1.12/scala_2.11-java11-debian/docker-entrypoint.sh
+++ b/1.12/scala_2.11-java11-debian/docker-entrypoint.sh
@@ -22,7 +22,6 @@ COMMAND_STANDALONE="standalone-job"
# Deprecated, should be remove in Flink release 1.13
COMMAND_NATIVE_KUBERNETES="native-k8s"
COMMAND_HISTORY_SERVER="history-server"
-COMMAND_DISABLE_JEMALLOC="disable-jemalloc"
# If unspecified, the hostname of the container is taken as the JobManager address
JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
@@ -77,17 +76,13 @@ set_config_option() {
fi
}
-set_common_options() {
+prepare_configuration() {
set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS}
set_config_option blob.server.port 6124
set_config_option query.server.port 6125
-}
-
-prepare_job_manager_start() {
- echo "Starting Job Manager"
- copy_plugins_if_required
- set_common_options
+ TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1}
+ set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
if [ -n "${FLINK_PROPERTIES}" ]; then
echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
@@ -95,73 +90,50 @@ prepare_job_manager_start() {
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
}
-disable_jemalloc_env() {
- # use nameref '_args' to update the passed 'args' within function
- local -n _args=$1
- if [ "${_args[0]}" = ${COMMAND_DISABLE_JEMALLOC} ]; then
- echo "Disable Jemalloc as the memory allocator"
- _args=("${_args[@]:1}")
- else
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
- fi
+maybe_enable_jemalloc() {
+ if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ fi
}
+maybe_enable_jemalloc
+
+copy_plugins_if_required
+
+prepare_configuration
+
args=("$@")
if [ "$1" = "help" ]; then
- printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER}) [${COMMAND_DISABLE_JEMALLOC}]\n"
+ printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER})\n"
printf " Or $(basename "$0") help\n\n"
- printf "By default, Flink image adopts jemalloc as default memory allocator and will disable jemalloc if option '${COMMAND_DISABLE_JEMALLOC}' given.\n"
+ printf "By default, Flink image adopts jemalloc as default memory allocator. This behavior can be disabled by setting the 'DISABLE_JEMALLOC' environment variable to 'true'.\n"
exit 0
elif [ "$1" = "jobmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_STANDALONE} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting History Server"
- copy_plugins_if_required
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/historyserver.sh" start-foreground "${args[@]}"
elif [ "$1" = "taskmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting Task Manager"
- copy_plugins_if_required
-
- TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)}
-
- set_common_options
- set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
-
- copy_plugins_if_required
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
@@ -173,10 +145,6 @@ fi
args=("${args[@]}")
-disable_jemalloc_env args
-
-copy_plugins_if_required
-
# Set the Flink related environments
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
diff --git a/1.12/scala_2.11-java11-debian/release.metadata b/1.12/scala_2.11-java11-debian/release.metadata
index 901a0a7..b02dcab 100644
--- a/1.12/scala_2.11-java11-debian/release.metadata
+++ b/1.12/scala_2.11-java11-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.12.1-scala_2.11-java11, 1.12-scala_2.11-java11, scala_2.11-java11
+Tags: 1.12.0-scala_2.11-java11, 1.12-scala_2.11-java11, scala_2.11-java11
Architectures: amd64
diff --git a/1.12/scala_2.11-java8-debian/Dockerfile b/1.12/scala_2.11-java8-debian/Dockerfile
index 2ed4085..8c1291a 100644
--- a/1.12/scala_2.11-java8-debian/Dockerfile
+++ b/1.12/scala_2.11-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.12.1/flink-1.12.1-bin-scala_2.11.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.1/flink-1.12.1-bin-scala_2.11.tgz.asc \
- GPG_KEY=F8E419AA0B60C28879E876859DFF40967ABFC5A4 \
+ENV FLINK_TGZ_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.11.tgz \
+ FLINK_ASC_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.11.tgz.asc \
+ GPG_KEY=43CE299BC305AFF8B912AA95183F6944D9839159 \
CHECK_GPG=true
# Prepare environment
diff --git a/1.12/scala_2.11-java8-debian/docker-entrypoint.sh b/1.12/scala_2.11-java8-debian/docker-entrypoint.sh
index 65f8fc8..275488e 100755
--- a/1.12/scala_2.11-java8-debian/docker-entrypoint.sh
+++ b/1.12/scala_2.11-java8-debian/docker-entrypoint.sh
@@ -22,7 +22,6 @@ COMMAND_STANDALONE="standalone-job"
# Deprecated, should be remove in Flink release 1.13
COMMAND_NATIVE_KUBERNETES="native-k8s"
COMMAND_HISTORY_SERVER="history-server"
-COMMAND_DISABLE_JEMALLOC="disable-jemalloc"
# If unspecified, the hostname of the container is taken as the JobManager address
JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
@@ -77,17 +76,13 @@ set_config_option() {
fi
}
-set_common_options() {
+prepare_configuration() {
set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS}
set_config_option blob.server.port 6124
set_config_option query.server.port 6125
-}
-
-prepare_job_manager_start() {
- echo "Starting Job Manager"
- copy_plugins_if_required
- set_common_options
+ TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1}
+ set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
if [ -n "${FLINK_PROPERTIES}" ]; then
echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
@@ -95,73 +90,50 @@ prepare_job_manager_start() {
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
}
-disable_jemalloc_env() {
- # use nameref '_args' to update the passed 'args' within function
- local -n _args=$1
- if [ "${_args[0]}" = ${COMMAND_DISABLE_JEMALLOC} ]; then
- echo "Disable Jemalloc as the memory allocator"
- _args=("${_args[@]:1}")
- else
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
- fi
+maybe_enable_jemalloc() {
+ if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ fi
}
+maybe_enable_jemalloc
+
+copy_plugins_if_required
+
+prepare_configuration
+
args=("$@")
if [ "$1" = "help" ]; then
- printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER}) [${COMMAND_DISABLE_JEMALLOC}]\n"
+ printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER})\n"
printf " Or $(basename "$0") help\n\n"
- printf "By default, Flink image adopts jemalloc as default memory allocator and will disable jemalloc if option '${COMMAND_DISABLE_JEMALLOC}' given.\n"
+ printf "By default, Flink image adopts jemalloc as default memory allocator. This behavior can be disabled by setting the 'DISABLE_JEMALLOC' environment variable to 'true'.\n"
exit 0
elif [ "$1" = "jobmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_STANDALONE} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting History Server"
- copy_plugins_if_required
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/historyserver.sh" start-foreground "${args[@]}"
elif [ "$1" = "taskmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting Task Manager"
- copy_plugins_if_required
-
- TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)}
-
- set_common_options
- set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
-
- copy_plugins_if_required
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
@@ -173,10 +145,6 @@ fi
args=("${args[@]}")
-disable_jemalloc_env args
-
-copy_plugins_if_required
-
# Set the Flink related environments
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
diff --git a/1.12/scala_2.11-java8-debian/release.metadata b/1.12/scala_2.11-java8-debian/release.metadata
index c8cd682..3e3769f 100644
--- a/1.12/scala_2.11-java8-debian/release.metadata
+++ b/1.12/scala_2.11-java8-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.12.1-scala_2.11-java8, 1.12-scala_2.11-java8, scala_2.11-java8, 1.12.1-scala_2.11, 1.12-scala_2.11, scala_2.11
+Tags: 1.12.0-scala_2.11-java8, 1.12-scala_2.11-java8, scala_2.11-java8, 1.12.0-scala_2.11, 1.12-scala_2.11, scala_2.11
Architectures: amd64
diff --git a/1.12/scala_2.12-java11-debian/Dockerfile b/1.12/scala_2.12-java11-debian/Dockerfile
index c1e11b8..1a6e48a 100644
--- a/1.12/scala_2.12-java11-debian/Dockerfile
+++ b/1.12/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.12.1/flink-1.12.1-bin-scala_2.12.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.1/flink-1.12.1-bin-scala_2.12.tgz.asc \
- GPG_KEY=F8E419AA0B60C28879E876859DFF40967ABFC5A4 \
+ENV FLINK_TGZ_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.12.tgz \
+ FLINK_ASC_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.12.tgz.asc \
+ GPG_KEY=43CE299BC305AFF8B912AA95183F6944D9839159 \
CHECK_GPG=true
# Prepare environment
diff --git a/1.12/scala_2.12-java11-debian/docker-entrypoint.sh b/1.12/scala_2.12-java11-debian/docker-entrypoint.sh
index 65f8fc8..275488e 100755
--- a/1.12/scala_2.12-java11-debian/docker-entrypoint.sh
+++ b/1.12/scala_2.12-java11-debian/docker-entrypoint.sh
@@ -22,7 +22,6 @@ COMMAND_STANDALONE="standalone-job"
# Deprecated, should be remove in Flink release 1.13
COMMAND_NATIVE_KUBERNETES="native-k8s"
COMMAND_HISTORY_SERVER="history-server"
-COMMAND_DISABLE_JEMALLOC="disable-jemalloc"
# If unspecified, the hostname of the container is taken as the JobManager address
JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
@@ -77,17 +76,13 @@ set_config_option() {
fi
}
-set_common_options() {
+prepare_configuration() {
set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS}
set_config_option blob.server.port 6124
set_config_option query.server.port 6125
-}
-
-prepare_job_manager_start() {
- echo "Starting Job Manager"
- copy_plugins_if_required
- set_common_options
+ TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1}
+ set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
if [ -n "${FLINK_PROPERTIES}" ]; then
echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
@@ -95,73 +90,50 @@ prepare_job_manager_start() {
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
}
-disable_jemalloc_env() {
- # use nameref '_args' to update the passed 'args' within function
- local -n _args=$1
- if [ "${_args[0]}" = ${COMMAND_DISABLE_JEMALLOC} ]; then
- echo "Disable Jemalloc as the memory allocator"
- _args=("${_args[@]:1}")
- else
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
- fi
+maybe_enable_jemalloc() {
+ if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ fi
}
+maybe_enable_jemalloc
+
+copy_plugins_if_required
+
+prepare_configuration
+
args=("$@")
if [ "$1" = "help" ]; then
- printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER}) [${COMMAND_DISABLE_JEMALLOC}]\n"
+ printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER})\n"
printf " Or $(basename "$0") help\n\n"
- printf "By default, Flink image adopts jemalloc as default memory allocator and will disable jemalloc if option '${COMMAND_DISABLE_JEMALLOC}' given.\n"
+ printf "By default, Flink image adopts jemalloc as default memory allocator. This behavior can be disabled by setting the 'DISABLE_JEMALLOC' environment variable to 'true'.\n"
exit 0
elif [ "$1" = "jobmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_STANDALONE} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting History Server"
- copy_plugins_if_required
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/historyserver.sh" start-foreground "${args[@]}"
elif [ "$1" = "taskmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting Task Manager"
- copy_plugins_if_required
-
- TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)}
-
- set_common_options
- set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
-
- copy_plugins_if_required
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
@@ -173,10 +145,6 @@ fi
args=("${args[@]}")
-disable_jemalloc_env args
-
-copy_plugins_if_required
-
# Set the Flink related environments
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
diff --git a/1.12/scala_2.12-java11-debian/release.metadata b/1.12/scala_2.12-java11-debian/release.metadata
index 3a8ffce..234cbda 100644
--- a/1.12/scala_2.12-java11-debian/release.metadata
+++ b/1.12/scala_2.12-java11-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.12.1-scala_2.12-java11, 1.12-scala_2.12-java11, scala_2.12-java11, 1.12.1-java11, 1.12-java11, java11
+Tags: 1.12.0-scala_2.12-java11, 1.12-scala_2.12-java11, scala_2.12-java11, 1.12.0-java11, 1.12-java11, java11
Architectures: amd64
diff --git a/1.12/scala_2.12-java8-debian/Dockerfile b/1.12/scala_2.12-java8-debian/Dockerfile
index 777abda..48164fd 100644
--- a/1.12/scala_2.12-java8-debian/Dockerfile
+++ b/1.12/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.12.1/flink-1.12.1-bin-scala_2.12.tgz \
- FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.12.1/flink-1.12.1-bin-scala_2.12.tgz.asc \
- GPG_KEY=F8E419AA0B60C28879E876859DFF40967ABFC5A4 \
+ENV FLINK_TGZ_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.12.tgz \
+ FLINK_ASC_URL=https://archive.apache.org/dist/flink/flink-1.12.0/flink-1.12.0-bin-scala_2.12.tgz.asc \
+ GPG_KEY=43CE299BC305AFF8B912AA95183F6944D9839159 \
CHECK_GPG=true
# Prepare environment
diff --git a/1.12/scala_2.12-java8-debian/docker-entrypoint.sh b/1.12/scala_2.12-java8-debian/docker-entrypoint.sh
index 65f8fc8..275488e 100755
--- a/1.12/scala_2.12-java8-debian/docker-entrypoint.sh
+++ b/1.12/scala_2.12-java8-debian/docker-entrypoint.sh
@@ -22,7 +22,6 @@ COMMAND_STANDALONE="standalone-job"
# Deprecated, should be remove in Flink release 1.13
COMMAND_NATIVE_KUBERNETES="native-k8s"
COMMAND_HISTORY_SERVER="history-server"
-COMMAND_DISABLE_JEMALLOC="disable-jemalloc"
# If unspecified, the hostname of the container is taken as the JobManager address
JOB_MANAGER_RPC_ADDRESS=${JOB_MANAGER_RPC_ADDRESS:-$(hostname -f)}
@@ -77,17 +76,13 @@ set_config_option() {
fi
}
-set_common_options() {
+prepare_configuration() {
set_config_option jobmanager.rpc.address ${JOB_MANAGER_RPC_ADDRESS}
set_config_option blob.server.port 6124
set_config_option query.server.port 6125
-}
-
-prepare_job_manager_start() {
- echo "Starting Job Manager"
- copy_plugins_if_required
- set_common_options
+ TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1}
+ set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
if [ -n "${FLINK_PROPERTIES}" ]; then
echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
@@ -95,73 +90,50 @@ prepare_job_manager_start() {
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
}
-disable_jemalloc_env() {
- # use nameref '_args' to update the passed 'args' within function
- local -n _args=$1
- if [ "${_args[0]}" = ${COMMAND_DISABLE_JEMALLOC} ]; then
- echo "Disable Jemalloc as the memory allocator"
- _args=("${_args[@]:1}")
- else
- export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
- fi
+maybe_enable_jemalloc() {
+ if [ "${DISABLE_JEMALLOC:-false}" == "false" ]; then
+ export LD_PRELOAD=$LD_PRELOAD:/usr/lib/x86_64-linux-gnu/libjemalloc.so
+ fi
}
+maybe_enable_jemalloc
+
+copy_plugins_if_required
+
+prepare_configuration
+
args=("$@")
if [ "$1" = "help" ]; then
- printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER}) [${COMMAND_DISABLE_JEMALLOC}]\n"
+ printf "Usage: $(basename "$0") (jobmanager|${COMMAND_STANDALONE}|taskmanager|${COMMAND_HISTORY_SERVER})\n"
printf " Or $(basename "$0") help\n\n"
- printf "By default, Flink image adopts jemalloc as default memory allocator and will disable jemalloc if option '${COMMAND_DISABLE_JEMALLOC}' given.\n"
+ printf "By default, Flink image adopts jemalloc as default memory allocator. This behavior can be disabled by setting the 'DISABLE_JEMALLOC' environment variable to 'true'.\n"
exit 0
elif [ "$1" = "jobmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_STANDALONE} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
- prepare_job_manager_start
+ echo "Starting Job Manager"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/standalone-job.sh" start-foreground "${args[@]}"
elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting History Server"
- copy_plugins_if_required
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/historyserver.sh" start-foreground "${args[@]}"
elif [ "$1" = "taskmanager" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
echo "Starting Task Manager"
- copy_plugins_if_required
-
- TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-$(grep -c ^processor /proc/cpuinfo)}
-
- set_common_options
- set_config_option taskmanager.numberOfTaskSlots ${TASK_MANAGER_NUMBER_OF_TASK_SLOTS}
-
- if [ -n "${FLINK_PROPERTIES}" ]; then
- echo "${FLINK_PROPERTIES}" >> "${CONF_FILE}"
- fi
- envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "${args[@]}"
elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then
args=("${args[@]:1}")
- disable_jemalloc_env args
-
- copy_plugins_if_required
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
@@ -173,10 +145,6 @@ fi
args=("${args[@]}")
-disable_jemalloc_env args
-
-copy_plugins_if_required
-
# Set the Flink related environments
export _FLINK_HOME_DETERMINED=true
. $FLINK_HOME/bin/config.sh
diff --git a/1.12/scala_2.12-java8-debian/release.metadata b/1.12/scala_2.12-java8-debian/release.metadata
index 5fc3af7..bb3d3af 100644
--- a/1.12/scala_2.12-java8-debian/release.metadata
+++ b/1.12/scala_2.12-java8-debian/release.metadata
@@ -1,2 +1,2 @@
-Tags: 1.12.1-scala_2.12-java8, 1.12-scala_2.12-java8, scala_2.12-java8, 1.12.1-scala_2.12, 1.12-scala_2.12, scala_2.12, 1.12.1-java8, 1.12-java8, java8, 1.12.1, 1.12, latest
+Tags: 1.12.0-scala_2.12-java8, 1.12-scala_2.12-java8, scala_2.12-java8, 1.12.0-scala_2.12, 1.12-scala_2.12, scala_2.12, 1.12.0-java8, 1.12-java8, java8, 1.12.0, 1.12, latest
Architectures: amd64