[FLINK-33677][core] Remove flink-conf.yaml from flink dist.

apache · Sep 11, 2024 · 6bac0c6 · 6bac0c6
1 parent 86aab80
commit 6bac0c6
Showing 1 changed file with 7 additions and 16 deletions.
diff --git 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 /