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 Apache Flink to 1.18.1 #16114

Merged
merged 1 commit into from
Jan 23, 2024
Merged

Conversation

JingGe
Copy link
Contributor

@JingGe JingGe commented Jan 23, 2024

This adds the new Flink 1.18.1 release: https://flink.apache.org/2024/01/19/apache-flink-1.18.1-release-announcement/

Change apache download link for asc files and therefore updated tags for 1.17.2, 1.16.3, and 1.15.4 accordingly.

Copy link

Diff for 11c4d22:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 272be46..219f9d4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,37 +1,47 @@
 Maintainers: The Apache Flink Project <[email protected]> (@ApacheFlink)
 GitRepo: https://github.com/apache/flink-docker.git
 
+Tags: 1.15.4-scala_2.12-java8, 1.15-scala_2.12-java8, 1.15.4-java8, 1.15-java8
+Architectures: amd64, arm64v8
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
+Directory: 1.15/scala_2.12-java8-ubuntu
+
+Tags: 1.15.4-scala_2.12-java11, 1.15-scala_2.12-java11, 1.15.4-scala_2.12, 1.15-scala_2.12, 1.15.4-java11, 1.15-java11, 1.15.4, 1.15
+Architectures: amd64, arm64v8
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
+Directory: 1.15/scala_2.12-java11-ubuntu
+
 Tags: 1.16.3-scala_2.12-java8, 1.16-scala_2.12-java8, 1.16.3-java8, 1.16-java8
 Architectures: amd64, arm64v8
-GitCommit: fce2e96cea2ef6ced375c113486db5cbb02e0480
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.16/scala_2.12-java8-ubuntu
 
 Tags: 1.16.3-scala_2.12-java11, 1.16-scala_2.12-java11, 1.16.3-scala_2.12, 1.16-scala_2.12, 1.16.3-java11, 1.16-java11, 1.16.3, 1.16
 Architectures: amd64, arm64v8
-GitCommit: fce2e96cea2ef6ced375c113486db5cbb02e0480
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.16/scala_2.12-java11-ubuntu
 
 Tags: 1.17.2-scala_2.12-java8, 1.17-scala_2.12-java8, 1.17.2-java8, 1.17-java8
 Architectures: amd64, arm64v8
-GitCommit: f433de5a1d764638392cea1737fc6b03b8e760aa
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.17/scala_2.12-java8-ubuntu
 
 Tags: 1.17.2-scala_2.12-java11, 1.17-scala_2.12-java11, 1.17.2-scala_2.12, 1.17-scala_2.12, 1.17.2-java11, 1.17-java11, 1.17.2, 1.17
 Architectures: amd64, arm64v8
-GitCommit: f433de5a1d764638392cea1737fc6b03b8e760aa
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.17/scala_2.12-java11-ubuntu
 
-Tags: 1.18.0-scala_2.12-java8, 1.18-scala_2.12-java8, scala_2.12-java8, 1.18.0-java8, 1.18-java8, java8
+Tags: 1.18.1-scala_2.12-java8, 1.18-scala_2.12-java8, scala_2.12-java8, 1.18.1-java8, 1.18-java8, java8
 Architectures: amd64, arm64v8
-GitCommit: 3154e4800c2aa8f183ac4b03dcdc90b14a6404a1
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.18/scala_2.12-java8-ubuntu
 
-Tags: 1.18.0-scala_2.12-java11, 1.18-scala_2.12-java11, scala_2.12-java11, 1.18.0-scala_2.12, 1.18-scala_2.12, scala_2.12, 1.18.0-java11, 1.18-java11, java11, 1.18.0, 1.18, latest
+Tags: 1.18.1-scala_2.12-java11, 1.18-scala_2.12-java11, scala_2.12-java11, 1.18.1-scala_2.12, 1.18-scala_2.12, scala_2.12, 1.18.1-java11, 1.18-java11, java11, 1.18.1, 1.18, latest
 Architectures: amd64, arm64v8
-GitCommit: 3154e4800c2aa8f183ac4b03dcdc90b14a6404a1
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.18/scala_2.12-java11-ubuntu
 
-Tags: 1.18.0-scala_2.12-java17, 1.18-scala_2.12-java17, scala_2.12-java17, 1.18.0-java17, 1.18-java17, java17
+Tags: 1.18.1-scala_2.12-java17, 1.18-scala_2.12-java17, scala_2.12-java17, 1.18.1-java17, 1.18-java17, java17
 Architectures: amd64, arm64v8
-GitCommit: 3154e4800c2aa8f183ac4b03dcdc90b14a6404a1
+GitCommit: 8eb7ea1a0e668146b2da1dcd08e311e7f7f318f1
 Directory: 1.18/scala_2.12-java17-ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index e1fefe2..35f2ab8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,3 +1,15 @@
+flink:1.15
+flink:1.15-java8
+flink:1.15-java11
+flink:1.15-scala_2.12
+flink:1.15-scala_2.12-java8
+flink:1.15-scala_2.12-java11
+flink:1.15.4
+flink:1.15.4-java8
+flink:1.15.4-java11
+flink:1.15.4-scala_2.12
+flink:1.15.4-scala_2.12-java8
+flink:1.15.4-scala_2.12-java11
 flink:1.16
 flink:1.16-java8
 flink:1.16-java11
@@ -30,14 +42,14 @@ 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.0
-flink:1.18.0-java8
-flink:1.18.0-java11
-flink:1.18.0-java17
-flink:1.18.0-scala_2.12
-flink:1.18.0-scala_2.12-java8
-flink:1.18.0-scala_2.12-java11
-flink:1.18.0-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:java8
 flink:java11
 flink:java17
diff --git a/flink_1.16-java8/Dockerfile b/flink_1.15-java8/Dockerfile
similarity index 94%
copy from flink_1.16-java8/Dockerfile
copy to flink_1.15-java8/Dockerfile
index da472a6..50bafa4 100644
--- a/flink_1.16-java8/Dockerfile
+++ b/flink_1.15-java8/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.16.3/flink-1.16.3-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.15.4/flink-1.15.4-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.15.4/flink-1.15.4-bin-scala_2.12.tgz.asc \
+    GPG_KEY=0F79F2AFB2351BC29678544591F9C1EC125FD8DB \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_1.16-java8/docker-entrypoint.sh b/flink_1.15-java8/docker-entrypoint.sh
similarity index 100%
copy from flink_1.16-java8/docker-entrypoint.sh
copy to flink_1.15-java8/docker-entrypoint.sh
diff --git a/flink_latest/Dockerfile b/flink_1.15/Dockerfile
similarity index 94%
copy from flink_latest/Dockerfile
copy to flink_1.15/Dockerfile
index a53d960..2f38d26 100644
--- a/flink_latest/Dockerfile
+++ b/flink_1.15/Dockerfile
@@ -44,9 +44,9 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz.asc \
-    GPG_KEY=96AE0E32CBE6E0753CE6DF6CB078D1D3253A8D82 \
+ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.15.4/flink-1.15.4-bin-scala_2.12.tgz \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.15.4/flink-1.15.4-bin-scala_2.12.tgz.asc \
+    GPG_KEY=0F79F2AFB2351BC29678544591F9C1EC125FD8DB \
     CHECK_GPG=true
 
 # Prepare environment
diff --git a/flink_1.16-java8/docker-entrypoint.sh b/flink_1.15/docker-entrypoint.sh
similarity index 100%
copy from flink_1.16-java8/docker-entrypoint.sh
copy to flink_1.15/docker-entrypoint.sh
diff --git a/flink_1.16-java8/Dockerfile b/flink_1.16-java8/Dockerfile
index da472a6..d7761af 100644
--- a/flink_1.16-java8/Dockerfile
+++ b/flink_1.16-java8/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex; \
 
 # Configure Flink version
 ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz.asc \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz.asc \
     GPG_KEY=B2D64016B940A7E0B9B72E0D7D0528B28037D8BC \
     CHECK_GPG=true
 
diff --git a/flink_1.16/Dockerfile b/flink_1.16/Dockerfile
index 90f5fb2..08c808b 100644
--- a/flink_1.16/Dockerfile
+++ b/flink_1.16/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex; \
 
 # Configure Flink version
 ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz.asc \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.16.3/flink-1.16.3-bin-scala_2.12.tgz.asc \
     GPG_KEY=B2D64016B940A7E0B9B72E0D7D0528B28037D8BC \
     CHECK_GPG=true
 
diff --git a/flink_1.17-java8/Dockerfile b/flink_1.17-java8/Dockerfile
index 9ff2e86..f3f3c18 100644
--- a/flink_1.17-java8/Dockerfile
+++ b/flink_1.17-java8/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex; \
 
 # Configure Flink version
 ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz.asc \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz.asc \
     GPG_KEY=2E0E1AB5D39D55E608071FB9F795C02A4D2482B3 \
     CHECK_GPG=true
 
diff --git a/flink_1.17/Dockerfile b/flink_1.17/Dockerfile
index 3b87e2d..b4ac0b2 100644
--- a/flink_1.17/Dockerfile
+++ b/flink_1.17/Dockerfile
@@ -45,7 +45,7 @@ RUN set -ex; \
 
 # Configure Flink version
 ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz.asc \
+    FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz.asc \
     GPG_KEY=2E0E1AB5D39D55E608071FB9F795C02A4D2482B3 \
     CHECK_GPG=true
 
diff --git a/flink_java17/Dockerfile b/flink_java17/Dockerfile
index 2a41dae..27f23fb 100644
--- a/flink_java17/Dockerfile
+++ b/flink_java17/Dockerfile
@@ -44,8 +44,8 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz.asc \
+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
 
diff --git a/flink_java8/Dockerfile b/flink_java8/Dockerfile
index 72f7282..ed727e9 100644
--- a/flink_java8/Dockerfile
+++ b/flink_java8/Dockerfile
@@ -44,8 +44,8 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz.asc \
+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
 
diff --git a/flink_latest/Dockerfile b/flink_latest/Dockerfile
index a53d960..2dcbd27 100644
--- a/flink_latest/Dockerfile
+++ b/flink_latest/Dockerfile
@@ -44,8 +44,8 @@ RUN set -ex; \
   gosu nobody true
 
 # Configure Flink version
-ENV FLINK_TGZ_URL=https://www.apache.org/dyn/closer.cgi?action=download&filename=flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz \
-    FLINK_ASC_URL=https://www.apache.org/dist/flink/flink-1.18.0/flink-1.18.0-bin-scala_2.12.tgz.asc \
+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

Relevant Maintainers:

  • flink: @ApacheFlink

@tianon
Copy link
Member

tianon commented Jan 23, 2024

It might be worth considering (in the future) switching to the Apache CDN explicitly: https://www.apache.org/mirrors 👀

(I only just noticed this change myself last week 😅 ❤️)

Edit: see also docker-library/tomcat#308

@tianon tianon merged commit 1ee3d4b into docker-library:master Jan 23, 2024
14 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.

2 participants