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

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


The following commit(s) were added to refs/heads/dev-master by this push:
     new 6bac0c6  [FLINK-33677][core] Remove flink-conf.yaml from flink dist.
6bac0c6 is described below

commit 6bac0c6248e1b13eb09c1fb0fb51f5b400202679
Author: JunRuiLee <[email protected]>
AuthorDate: Fri Aug 23 12:27:32 2024 +0800

    [FLINK-33677][core] Remove flink-conf.yaml from flink dist.
---
 Dockerfile-ubuntu.template | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/Dockerfile-ubuntu.template b/Dockerfile-ubuntu.template
index 8d364e0..e54d125 100644
--- a/Dockerfile-ubuntu.template
+++ b/Dockerfile-ubuntu.template
@@ -81,22 +81,13 @@ RUN set -ex; \
   chown -R flink:flink .; \
   \
   # Replace default REST/RPC endpoint bind address to use the container's 
network interface \
-  CONF_FILE="$FLINK_HOME/conf/flink-conf.yaml"; \
-  if [ ! -e "$FLINK_HOME/conf/flink-conf.yaml" ]; then \
-    CONF_FILE="${FLINK_HOME}/conf/config.yaml"; \
-    /bin/bash "$FLINK_HOME/bin/config-parser-utils.sh" "${FLINK_HOME}/conf" 
"${FLINK_HOME}/bin" "${FLINK_HOME}/lib" \
-        "-repKV" "rest.address,localhost,0.0.0.0" \
-        "-repKV" "rest.bind-address,localhost,0.0.0.0" \
-        "-repKV" "jobmanager.bind-host,localhost,0.0.0.0" \
-        "-repKV" "taskmanager.bind-host,localhost,0.0.0.0" \
-        "-rmKV" "taskmanager.host=localhost"; \
-  else \
-    sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' "$CONF_FILE"; \
-    sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' 
"$CONF_FILE"; \
-    sed -i 's/jobmanager.bind-host: localhost/jobmanager.bind-host: 0.0.0.0/g' 
"$CONF_FILE"; \
-    sed -i 's/taskmanager.bind-host: localhost/taskmanager.bind-host: 
0.0.0.0/g' "$CONF_FILE"; \
-    sed -i '/taskmanager.host: localhost/d' "$CONF_FILE"; \
-  fi;
+  CONF_FILE="${FLINK_HOME}/conf/config.yaml"; \
+  /bin/bash "$FLINK_HOME/bin/config-parser-utils.sh" "${FLINK_HOME}/conf" 
"${FLINK_HOME}/bin" "${FLINK_HOME}/lib" \
+    "-repKV" "rest.address,localhost,0.0.0.0" \
+    "-repKV" "rest.bind-address,localhost,0.0.0.0" \
+    "-repKV" "jobmanager.bind-host,localhost,0.0.0.0" \
+    "-repKV" "taskmanager.bind-host,localhost,0.0.0.0" \
+    "-rmKV" "taskmanager.host=localhost";
 
 # Configure container
 COPY docker-entrypoint.sh /

Reply via email to