Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Apache Flink 1.19.2 and 1.20.1 #18452

Merged
merged 2 commits into from
Feb 18, 2025

Conversation

afedulov
Copy link

  • Add new release 1.19.2
  • Add new release 1.20.1
  • Remove EOL 1.18 release

@afedulov afedulov requested a review from a team as a code owner February 13, 2025 19:30

This comment has been minimized.

@afedulov afedulov changed the title Update to Flink 1.19.2 and 1.20.1 Update to Apache Flink 1.19.2 and 1.20.1 Feb 13, 2025
@tianon
Copy link
Member

tianon commented Feb 13, 2025

diff --git a/flink_1.19-java17/docker-entrypoint.sh b/flink_1.19-java17/docker-entrypoint.sh
index e081109..e884375 100755
--- a/flink_1.19-java17/docker-entrypoint.sh
+++ b/flink_1.19-java17/docker-entrypoint.sh
@@ -65,19 +65,19 @@ set_config_options() {
     local bin_dir="$FLINK_HOME/bin"
     local lib_dir="$FLINK_HOME/lib"
 
-    local config_params=()
+    local config_params=""
 
     while [ $# -gt 0 ]; do
         local key="$1"
         local value="$2"
 
-        config_params+=("-D${key}=${value}")
+        config_params+=" -D${key}=${value}"
 
         shift 2
     done
 
-    if [ "${#config_params[@]}" -gt 0 ]; then
-        "${config_parser_script}" "${config_dir}" "${bin_dir}" "${lib_dir}" "${config_params[@]}"
+    if [ ! -z "${config_params}" ]; then
+        eval "${config_parser_script} ${config_dir} ${bin_dir} ${lib_dir} ${config_params}"
     fi
 }
 

This change seems like it was unintentional (there's no explicit reference to it in either the commit or the PR that introduced it). 🤔

Can you elaborate on the intent / problem it's solving? Some of the potentially unintentional side-effects of it are things in the same realm as SQL injection -- config params containing $ that now parse variable references where they shouldn't, directories or values with spaces in their paths causing unintentional behavior, etc.

@afedulov
Copy link
Author

afedulov commented Feb 13, 2025

@tianon it seems that the release manager for Apache Flink 1.19.1, did not update the base docker-entrypoint.sh on top of which we run ./add-version.sh -r 1.19 -f 1.19.2 [link], according to the release workflow instructions.
https://github.com/apache/flink-docker/blob/dev-1.19/docker-entrypoint.sh#L66-L74
https://github.com/apache/flink-docker/blob/dev-1.20/docker-entrypoint.sh#L66-L74

Basically the dev-1.19/docker-entrypoint.sh is out of sync from what was actually generated/published for the previous 1.19.1 release. It appears that the 1.20 branch was used instead.

@afedulov
Copy link
Author

fixing on our side apache/flink-docker#215

This comment has been minimized.

@afedulov
Copy link
Author

afedulov commented Feb 14, 2025

@tianon fixed in flink-docker: apache/flink-docker@e2765a6
PTAL
Thanks for catching this discrepancy.

@yosifkit
Copy link
Member

Tags: scala_2.12-java11, scala_2.12, java11, latest
Tags: scala_2.12-java17, java17

You are certain that you want to move these generic tags from 1.20 releases to the 2.0-preview images?

This comment has been minimized.

This comment has been minimized.

Copy link

Diff for cbf007c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index b25c326..0486787 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,49 +1,34 @@
 Maintainers: The Apache Flink Project <[email protected]> (@ApacheFlink)
 GitRepo: https://github.com/apache/flink-docker.git
 
-Tags: 1.18.1-scala_2.12-java8, 1.18-scala_2.12-java8, 1.18.1-java8, 1.18-java8
+Tags: 1.19.2-scala_2.12-java8, 1.19-scala_2.12-java8, 1.19.2-java8, 1.19-java8
 Architectures: amd64, arm64v8
-GitCommit: 883600747505c128d97e9d25c9326f0c6f1d31e4
-Directory: 1.18/scala_2.12-java8-ubuntu
-
-Tags: 1.18.1-scala_2.12-java11, 1.18-scala_2.12-java11, 1.18.1-scala_2.12, 1.18-scala_2.12, 1.18.1-java11, 1.18-java11, 1.18.1, 1.18
-Architectures: amd64, arm64v8
-GitCommit: 883600747505c128d97e9d25c9326f0c6f1d31e4
-Directory: 1.18/scala_2.12-java11-ubuntu
-
-Tags: 1.18.1-scala_2.12-java17, 1.18-scala_2.12-java17, 1.18.1-java17, 1.18-java17
-Architectures: amd64, arm64v8
-GitCommit: 883600747505c128d97e9d25c9326f0c6f1d31e4
-Directory: 1.18/scala_2.12-java17-ubuntu
-
-Tags: 1.19.1-scala_2.12-java8, 1.19-scala_2.12-java8, 1.19.1-java8, 1.19-java8
-Architectures: amd64, arm64v8
-GitCommit: f77b347d0a534da0482e692d80f559f47041829e
+GitCommit: e2765a6d67449ccd22bc75050449b199a3a91302
 Directory: 1.19/scala_2.12-java8-ubuntu
 
-Tags: 1.19.1-scala_2.12-java11, 1.19-scala_2.12-java11, 1.19.1-scala_2.12, 1.19-scala_2.12, 1.19.1-java11, 1.19-java11, 1.19.1, 1.19
+Tags: 1.19.2-scala_2.12-java11, 1.19-scala_2.12-java11, 1.19.2-scala_2.12, 1.19-scala_2.12, 1.19.2-java11, 1.19-java11, 1.19.2, 1.19
 Architectures: amd64, arm64v8
-GitCommit: f77b347d0a534da0482e692d80f559f47041829e
+GitCommit: e2765a6d67449ccd22bc75050449b199a3a91302
 Directory: 1.19/scala_2.12-java11-ubuntu
 
-Tags: 1.19.1-scala_2.12-java17, 1.19-scala_2.12-java17, 1.19.1-java17, 1.19-java17
+Tags: 1.19.2-scala_2.12-java17, 1.19-scala_2.12-java17, 1.19.2-java17, 1.19-java17
 Architectures: amd64, arm64v8
-GitCommit: f77b347d0a534da0482e692d80f559f47041829e
+GitCommit: e2765a6d67449ccd22bc75050449b199a3a91302
 Directory: 1.19/scala_2.12-java17-ubuntu
 
-Tags: 1.20.0-scala_2.12-java8, 1.20-scala_2.12-java8, scala_2.12-java8, 1.20.0-java8, 1.20-java8, java8
+Tags: 1.20.1-scala_2.12-java8, 1.20-scala_2.12-java8, 1.20.1-java8, 1.20-java8
 Architectures: amd64, arm64v8
-GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
+GitCommit: 5d24800c76946c9271d285efe16a299b6c0b0607
 Directory: 1.20/scala_2.12-java8-ubuntu
 
-Tags: 1.20.0-scala_2.12-java11, 1.20-scala_2.12-java11, scala_2.12-java11, 1.20.0-scala_2.12, 1.20-scala_2.12, scala_2.12, 1.20.0-java11, 1.20-java11, java11, 1.20.0, 1.20, latest
+Tags: 1.20.1-scala_2.12-java11, 1.20-scala_2.12-java11, scala_2.12-java11, 1.20.1-scala_2.12, 1.20-scala_2.12, scala_2.12, 1.20.1-java11, 1.20-java11, java11, 1.20.1, 1.20, latest
 Architectures: amd64, arm64v8
-GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
+GitCommit: 5d24800c76946c9271d285efe16a299b6c0b0607
 Directory: 1.20/scala_2.12-java11-ubuntu
 
-Tags: 1.20.0-scala_2.12-java17, 1.20-scala_2.12-java17, scala_2.12-java17, 1.20.0-java17, 1.20-java17, java17
+Tags: 1.20.1-scala_2.12-java17, 1.20-scala_2.12-java17, scala_2.12-java17, 1.20-java17, 1.20.1-java17, java17
 Architectures: amd64, arm64v8
-GitCommit: 9d335b16e579d3207b769118990a602b8584b63d
+GitCommit: 5d24800c76946c9271d285efe16a299b6c0b0607
 Directory: 1.20/scala_2.12-java17-ubuntu
 
 Tags: 2.0-preview1-scala_2.12-java11, 2.0-scala_2.12-java11, 2.0-preview1-scala_2.12, 2.0-scala_2.12, 2.0-preview1-java11, 2.0-java11, 2.0-preview1, 2.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 4f99270..2167a47 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,19 +1,3 @@
-flink:1.18
-flink:1.18-java8
-flink:1.18-java11
-flink:1.18-java17
-flink:1.18-scala_2.12
-flink:1.18-scala_2.12-java8
-flink:1.18-scala_2.12-java11
-flink:1.18-scala_2.12-java17
-flink:1.18.1
-flink:1.18.1-java8
-flink:1.18.1-java11
-flink:1.18.1-java17
-flink:1.18.1-scala_2.12
-flink:1.18.1-scala_2.12-java8
-flink:1.18.1-scala_2.12-java11
-flink:1.18.1-scala_2.12-java17
 flink:1.19
 flink:1.19-java8
 flink:1.19-java11
@@ -22,14 +6,14 @@ flink:1.19-scala_2.12
 flink:1.19-scala_2.12-java8
 flink:1.19-scala_2.12-java11
 flink:1.19-scala_2.12-java17
-flink:1.19.1
-flink:1.19.1-java8
-flink:1.19.1-java11
-flink:1.19.1-java17
-flink:1.19.1-scala_2.12
-flink:1.19.1-scala_2.12-java8
-flink:1.19.1-scala_2.12-java11
-flink:1.19.1-scala_2.12-java17
+flink:1.19.2
+flink:1.19.2-java8
+flink:1.19.2-java11
+flink:1.19.2-java17
+flink:1.19.2-scala_2.12
+flink:1.19.2-scala_2.12-java8
+flink:1.19.2-scala_2.12-java11
+flink:1.19.2-scala_2.12-java17
 flink:1.20
 flink:1.20-java8
 flink:1.20-java11
@@ -38,14 +22,14 @@ flink:1.20-scala_2.12
 flink:1.20-scala_2.12-java8
 flink:1.20-scala_2.12-java11
 flink:1.20-scala_2.12-java17
-flink:1.20.0
-flink:1.20.0-java8
-flink:1.20.0-java11
-flink:1.20.0-java17
-flink:1.20.0-scala_2.12
-flink:1.20.0-scala_2.12-java8
-flink:1.20.0-scala_2.12-java11
-flink:1.20.0-scala_2.12-java17
+flink:1.20.1
+flink:1.20.1-java8
+flink:1.20.1-java11
+flink:1.20.1-java17
+flink:1.20.1-scala_2.12
+flink:1.20.1-scala_2.12-java8
+flink:1.20.1-scala_2.12-java11
+flink:1.20.1-scala_2.12-java17
 flink:2.0
 flink:2.0-java11
 flink:2.0-java17
@@ -58,11 +42,9 @@ flink:2.0-preview1-scala_2.12-java17
 flink:2.0-scala_2.12
 flink:2.0-scala_2.12-java11
 flink:2.0-scala_2.12-java17
-flink:java8
 flink:java11
 flink:java17
 flink:latest
 flink:scala_2.12
-flink:scala_2.12-java8
 flink:scala_2.12-java11
 flink:scala_2.12-java17
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 9da10c9..719cac1 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,11 +1,8 @@
-flink:1.18
-flink:1.18-java8
-flink:1.18-java17
 flink:1.19
 flink:1.19-java8
 flink:1.19-java17
+flink:1.20-java8
 flink:2.0
 flink:2.0-java17
-flink:java8
 flink:java17
 flink:latest
diff --git a/flink_1.18-java17/Dockerfile b/flink_1.18-java17/Dockerfile
deleted file mode 100644
index 1a5fd05..0000000
diff --git a/flink_1.18-java17/docker-entrypoint.sh b/flink_1.18-java17/docker-entrypoint.sh
deleted file mode 100755
index 8b0350e..0000000
diff --git a/flink_1.18-java8/Dockerfile b/flink_1.18-java8/Dockerfile
deleted file mode 100644
index 3b26678..0000000
diff --git a/flink_1.18-java8/docker-entrypoint.sh b/flink_1.18-java8/docker-entrypoint.sh
deleted file mode 100755
index 8b0350e..0000000
diff --git a/flink_1.18/Dockerfile b/flink_1.18/Dockerfile
deleted file mode 100644
index be6e28d..0000000
diff --git a/flink_1.18/docker-entrypoint.sh b/flink_1.18/docker-entrypoint.sh
deleted file mode 100755
index 8b0350e..0000000
diff --git a/flink_1.19-java17/Dockerfile b/flink_1.19-java17/Dockerfile
index 1c9ab39..6a29a16 100644
--- a/flink_1.19-java17/Dockerfile
+++ b/flink_1.19-java17/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.19.1/flink-1.19.1-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.1/flink-1.19.1-bin-scala_2.12.tgz.asc \
-    GPG_KEY=6378E37EB3AAEA188B9CB0D396C2914BB78A5EA1 \
+ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_1.19-java8/Dockerfile b/flink_1.19-java8/Dockerfile
index d079f01..8ffb00c 100644
--- a/flink_1.19-java8/Dockerfile
+++ b/flink_1.19-java8/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.19.1/flink-1.19.1-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.1/flink-1.19.1-bin-scala_2.12.tgz.asc \
-    GPG_KEY=6378E37EB3AAEA188B9CB0D396C2914BB78A5EA1 \
+ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_1.19/Dockerfile b/flink_1.19/Dockerfile
index e935aff..67aa5a3 100644
--- a/flink_1.19/Dockerfile
+++ b/flink_1.19/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.19.1/flink-1.19.1-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.1/flink-1.19.1-bin-scala_2.12.tgz.asc \
-    GPG_KEY=6378E37EB3AAEA188B9CB0D396C2914BB78A5EA1 \
+ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.2/flink-1.19.2-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_java8/Dockerfile b/flink_1.20-java8/Dockerfile
similarity index 95%
rename from flink_java8/Dockerfile
rename to flink_1.20-java8/Dockerfile
index 70f7518..1d4f94f 100644
--- a/flink_java8/Dockerfile
+++ b/flink_1.20-java8/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://dlcdn.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_java8/docker-entrypoint.sh b/flink_1.20-java8/docker-entrypoint.sh
similarity index 100%
rename from flink_java8/docker-entrypoint.sh
rename to flink_1.20-java8/docker-entrypoint.sh
diff --git a/flink_java17/Dockerfile b/flink_java17/Dockerfile
index dbc7e7f..081d9e8 100644
--- a/flink_java17/Dockerfile
+++ b/flink_java17/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://dlcdn.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_latest/Dockerfile b/flink_latest/Dockerfile
index 18c6ff9..0945696 100644
--- a/flink_latest/Dockerfile
+++ b/flink_latest/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://dlcdn.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.20.1/flink-1.20.1-bin-scala_2.12.tgz.asc \
+    GPG_KEY=5575E80D59BBB73C15A479B88C1FC56D16B0029D \
     CHECK_GPG=true
 
 # Prepare environment

Relevant Maintainers:

  • flink: @ApacheFlink

@afedulov
Copy link
Author

afedulov commented Feb 15, 2025

@yosifkit thanks for catching this! It is an unfortunate effect of our release scripts not having the notion of a "preview" release (2.0 is the first major release since 9 years). I moved the tags back into the stable version cbf007c, PTAL

@afedulov
Copy link
Author

@tianon could you please take look if all concerns are addressed now? We are blocked on this step for announcing the Flink releases.

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

These are a couple removed tags that you might still want. I didn't want to hold this up further since they can be added back in another PR.

-flink:java8
-flink:scala_2.12-java8

@yosifkit yosifkit merged commit 570059b into docker-library:master Feb 18, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants