tillrohrmann closed pull request #7126: [BP-1.7][FLINK-10906][docker] Don't
print configuration in docker-entrypoint.sh
URL: https://github.com/apache/flink/pull/7126
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/flink-container/docker/docker-entrypoint.sh
b/flink-container/docker/docker-entrypoint.sh
index 85ba8662bee..0bf7c04fa93 100755
--- a/flink-container/docker/docker-entrypoint.sh
+++ b/flink-container/docker/docker-entrypoint.sh
@@ -32,7 +32,6 @@ if [ "${CMD}" == "--help" -o "${CMD}" == "-h" ]; then
exit 0
elif [ "${CMD}" == "${JOB_CLUSTER}" -o "${CMD}" == "${TASK_MANAGER}" ]; then
echo "Starting the ${CMD}"
- echo "config file: " && grep '^[^\n#]' $FLINK_HOME/conf/flink-conf.yaml
if [ "${CMD}" == "${TASK_MANAGER}" ]; then
exec $FLINK_HOME/bin/taskmanager.sh start-foreground "$@"
diff --git a/flink-contrib/docker-flink/docker-entrypoint.sh
b/flink-contrib/docker-flink/docker-entrypoint.sh
index 1edf99ca6ab..a4e279fad3b 100755
--- a/flink-contrib/docker-flink/docker-entrypoint.sh
+++ b/flink-contrib/docker-flink/docker-entrypoint.sh
@@ -29,7 +29,6 @@ elif [ "$1" == "jobmanager" ]; then
echo "Starting Job Manager"
sed -i -e "s/jobmanager.rpc.address: localhost/jobmanager.rpc.address:
${JOB_MANAGER_RPC_ADDRESS}/g" $FLINK_HOME/conf/flink-conf.yaml
- echo "config file: " && grep '^[^\n#]' $FLINK_HOME/conf/flink-conf.yaml
exec $FLINK_HOME/bin/jobmanager.sh start-foreground
elif [ "$1" == "taskmanager" ]; then
@@ -37,7 +36,6 @@ elif [ "$1" == "taskmanager" ]; then
sed -i -e "s/taskmanager.numberOfTaskSlots:
1/taskmanager.numberOfTaskSlots: $(grep -c ^processor /proc/cpuinfo)/g"
$FLINK_HOME/conf/flink-conf.yaml
echo "Starting Task Manager"
- echo "config file: " && grep '^[^\n#]' $FLINK_HOME/conf/flink-conf.yaml
exec $FLINK_HOME/bin/taskmanager.sh start-foreground
fi
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
