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 2020/04/21 07:20:39 UTC
[flink-docker] 02/02: [FLINK-17214] Do not print configuration
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-docker.git
commit e0107b0f85d9b3630db39568729e36408cdc7b78
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Apr 17 11:39:25 2020 +0200
[FLINK-17214] Do not print configuration
Printing the configuration may leak credentials.
---
1.10/scala_2.11-debian/docker-entrypoint.sh | 2 --
1.10/scala_2.12-debian/docker-entrypoint.sh | 2 --
1.9/scala_2.11-debian/docker-entrypoint.sh | 2 --
1.9/scala_2.12-debian/docker-entrypoint.sh | 2 --
docker-entrypoint.sh | 2 --
5 files changed, 10 deletions(-)
diff --git a/1.10/scala_2.11-debian/docker-entrypoint.sh b/1.10/scala_2.11-debian/docker-entrypoint.sh
index 2cf3e4b..12e5d5a 100755
--- a/1.10/scala_2.11-debian/docker-entrypoint.sh
+++ b/1.10/scala_2.11-debian/docker-entrypoint.sh
@@ -87,7 +87,6 @@ elif [ "$1" = "jobmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@"
elif [ "$1" = "taskmanager" ]; then
shift 1
@@ -125,7 +124,6 @@ elif [ "$1" = "taskmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@"
fi
diff --git a/1.10/scala_2.12-debian/docker-entrypoint.sh b/1.10/scala_2.12-debian/docker-entrypoint.sh
index 2cf3e4b..12e5d5a 100755
--- a/1.10/scala_2.12-debian/docker-entrypoint.sh
+++ b/1.10/scala_2.12-debian/docker-entrypoint.sh
@@ -87,7 +87,6 @@ elif [ "$1" = "jobmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@"
elif [ "$1" = "taskmanager" ]; then
shift 1
@@ -125,7 +124,6 @@ elif [ "$1" = "taskmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@"
fi
diff --git a/1.9/scala_2.11-debian/docker-entrypoint.sh b/1.9/scala_2.11-debian/docker-entrypoint.sh
index 2cf3e4b..12e5d5a 100755
--- a/1.9/scala_2.11-debian/docker-entrypoint.sh
+++ b/1.9/scala_2.11-debian/docker-entrypoint.sh
@@ -87,7 +87,6 @@ elif [ "$1" = "jobmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@"
elif [ "$1" = "taskmanager" ]; then
shift 1
@@ -125,7 +124,6 @@ elif [ "$1" = "taskmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@"
fi
diff --git a/1.9/scala_2.12-debian/docker-entrypoint.sh b/1.9/scala_2.12-debian/docker-entrypoint.sh
index 2cf3e4b..12e5d5a 100755
--- a/1.9/scala_2.12-debian/docker-entrypoint.sh
+++ b/1.9/scala_2.12-debian/docker-entrypoint.sh
@@ -87,7 +87,6 @@ elif [ "$1" = "jobmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@"
elif [ "$1" = "taskmanager" ]; then
shift 1
@@ -125,7 +124,6 @@ elif [ "$1" = "taskmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@"
fi
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 2cf3e4b..12e5d5a 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -87,7 +87,6 @@ elif [ "$1" = "jobmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/jobmanager.sh" start-foreground "$@"
elif [ "$1" = "taskmanager" ]; then
shift 1
@@ -125,7 +124,6 @@ elif [ "$1" = "taskmanager" ]; then
fi
envsubst < "${CONF_FILE}" > "${CONF_FILE}.tmp" && mv "${CONF_FILE}.tmp" "${CONF_FILE}"
- echo "config file: " && grep '^[^\n#]' "${CONF_FILE}"
exec $(drop_privs_cmd) "$FLINK_HOME/bin/taskmanager.sh" start-foreground "$@"
fi