From 714bcdc2e66e7b442781f1a21ea342186beebbda Mon Sep 17 00:00:00 2001 From: woz Date: Sun, 1 Dec 2024 21:05:51 +0100 Subject: [PATCH] Revert "MET-5947 flink version upgraded to 1.20" This reverts commit face7a04 --- docker/build-docker-images.sh | 2 +- docker/flink-node/Dockerfile | 2 +- docker/flink_java21/Dockerfile | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/build-docker-images.sh b/docker/build-docker-images.sh index c7282d3..2bb8f6c 100755 --- a/docker/build-docker-images.sh +++ b/docker/build-docker-images.sh @@ -5,7 +5,7 @@ echo building flink-poc docker image that can be deployed on the openshift clust #images cd flink_java21 echo building :: flink java 21 base $(pwd) -docker build --no-cache -t flink:1.20.0-java21_poc . +docker build --no-cache -t flink:1.18.1-java21_poc . cd .. cd flink-node echo building :: flink-node $(pwd) diff --git a/docker/flink-node/Dockerfile b/docker/flink-node/Dockerfile index e88f170..a8fcd43 100644 --- a/docker/flink-node/Dockerfile +++ b/docker/flink-node/Dockerfile @@ -1,4 +1,4 @@ -FROM flink:1.20.0-java21_poc +FROM flink:1.18.1-java21_poc MAINTAINER PSNC diff --git a/docker/flink_java21/Dockerfile b/docker/flink_java21/Dockerfile index 47f8a1b..0b35455 100644 --- a/docker/flink_java21/Dockerfile +++ b/docker/flink_java21/Dockerfile @@ -44,9 +44,9 @@ RUN set -ex; \ gosu nobody true # Configure Flink version -ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.0/flink-1.20.0-bin-scala_2.12.tgz.asc \ - GPG_KEY=B2D64016B940A7E0B9B72E0D7D0528B28037D8BC \ +ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.18.1/flink-1.18.1-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.18.1/flink-1.18.1-bin-scala_2.12.tgz.asc \ + GPG_KEY=96AE0E32CBE6E0753CE6DF6CB078D1D3253A8D82 \ CHECK_GPG=true # Prepare environment @@ -81,11 +81,11 @@ RUN set -ex; \ chown -R flink:flink .; \ \ # Replace default REST/RPC endpoint bind address to use the container's network interface \ - sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' $FLINK_HOME/conf/config.yaml; \ - sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' $FLINK_HOME/conf/config.yaml; \ - sed -i 's/jobmanager.bind-host: localhost/jobmanager.bind-host: 0.0.0.0/g' $FLINK_HOME/conf/config.yaml; \ - sed -i 's/taskmanager.bind-host: localhost/taskmanager.bind-host: 0.0.0.0/g' $FLINK_HOME/conf/config.yaml; \ - sed -i '/taskmanager.host: localhost/d' $FLINK_HOME/conf/config.yaml; + sed -i 's/rest.address: localhost/rest.address: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \ + sed -i 's/rest.bind-address: localhost/rest.bind-address: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \ + sed -i 's/jobmanager.bind-host: localhost/jobmanager.bind-host: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \ + sed -i 's/taskmanager.bind-host: localhost/taskmanager.bind-host: 0.0.0.0/g' $FLINK_HOME/conf/flink-conf.yaml; \ + sed -i '/taskmanager.host: localhost/d' $FLINK_HOME/conf/flink-conf.yaml; # Configure container COPY docker-entrypoint.sh /