[flink-docker] branch dev-1.12 updated: [FLINK-21037] Deduplicate configuration logic

[chesnay]

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

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


The following commit(s) were added to refs/heads/dev-1.12 by this push:
     new 2324c8c  [FLINK-21037] Deduplicate configuration logic
2324c8c is described below

commit 2324c8ce0ba9bb5e44a1ea67b94f6ee9c4f702ce
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Wed Jan 20 01:32:36 2021 +0100

    [FLINK-21037] Deduplicate configuration logic
---
 docker-entrypoint.sh | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 8032681..275488e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -76,16 +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"
 
-    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}"
@@ -103,6 +100,8 @@ 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})\n"
@@ -112,13 +111,13 @@ if [ "$1" = "help" ]; then
 elif [ "$1" = "jobmanager" ]; then
     args=("${args[@]:1}")
 
-    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}")
 
-    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
@@ -126,27 +125,12 @@ elif [ "$1" = ${COMMAND_HISTORY_SERVER} ]; then
 
     echo "Starting History Server"
 
-    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}")
 
     echo "Starting Task Manager"
 
-    TASK_MANAGER_NUMBER_OF_TASK_SLOTS=${TASK_MANAGER_NUMBER_OF_TASK_SLOTS:-1}
-
-    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}")