This is an automated email from the ASF dual-hosted git repository. ron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink-docker.git
The following commit(s) were added to refs/heads/master by this push: new 398bafb [FLINK-38129][flink-docker] Update Dockerfiles for 2.1.0 release (#232) 398bafb is described below commit 398bafb626b7ee940cbd0d5026005d8d6f8d1786 Author: Ron <ldliu...@163.com> AuthorDate: Tue Jul 29 19:47:15 2025 +0800 [FLINK-38129][flink-docker] Update Dockerfiles for 2.1.0 release (#232) * [FLINK-38129][flink-docker] Updates snapshot workflow configuration * [FLINK-38129][flink-docker] Update Dockerfiles for 2.1.0 release --------- Co-authored-by: Ron Liu <r...@apache.org> --- .github/workflows/snapshot.yml | 11 +++----- 1.19/scala_2.12-java11-ubuntu/release.metadata | 2 -- 1.19/scala_2.12-java17-ubuntu/release.metadata | 2 -- 1.19/scala_2.12-java8-ubuntu/release.metadata | 2 -- {1.19 => 2.1}/scala_2.12-java11-ubuntu/Dockerfile | 29 +++++++------------- .../scala_2.12-java11-ubuntu/docker-entrypoint.sh | 0 2.1/scala_2.12-java11-ubuntu/release.metadata | 2 ++ {1.19 => 2.1}/scala_2.12-java17-ubuntu/Dockerfile | 29 +++++++------------- .../scala_2.12-java17-ubuntu/docker-entrypoint.sh | 0 2.1/scala_2.12-java17-ubuntu/release.metadata | 2 ++ .../scala_2.12-java21-ubuntu}/Dockerfile | 31 ++++++++-------------- .../scala_2.12-java21-ubuntu}/docker-entrypoint.sh | 0 2.1/scala_2.12-java21-ubuntu/release.metadata | 2 ++ 13 files changed, 41 insertions(+), 71 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 322b31b..92da54a 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -37,19 +37,16 @@ jobs: max-parallel: 1 matrix: java_version: [8, 11, 17, 21] - flink_version: [ 2.0-SNAPSHOT, 1.20-SNAPSHOT, 1.19-SNAPSHOT, 1.18-SNAPSHOT ] + flink_version: [ 2.1-SNAPSHOT, 2.0-SNAPSHOT, 1.20-SNAPSHOT, 1.19-SNAPSHOT ] include: - - flink_version: 2.0-SNAPSHOT + - flink_version: 2.1-SNAPSHOT branch: dev-master + - flink_version: 2.0-SNAPSHOT + branch: dev-2.0 - flink_version: 1.20-SNAPSHOT branch: dev-1.20 - flink_version: 1.19-SNAPSHOT branch: dev-1.19 - - flink_version: 1.18-SNAPSHOT - branch: dev-1.18 - exclude: - - flink_version: 1.18-SNAPSHOT - java_version: 21 steps: - uses: actions/checkout@v4 with: diff --git a/1.19/scala_2.12-java11-ubuntu/release.metadata b/1.19/scala_2.12-java11-ubuntu/release.metadata deleted file mode 100644 index 793b281..0000000 --- a/1.19/scala_2.12-java11-ubuntu/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.19.3-scala_2.12-java11, 1.19-scala_2.12-java11, scala_2.12-java11, 1.19.3-scala_2.12, 1.19-scala_2.12, scala_2.12, 1.19.3-java11, 1.19-java11, java11, 1.19.3, 1.19, latest -Architectures: amd64,arm64v8 diff --git a/1.19/scala_2.12-java17-ubuntu/release.metadata b/1.19/scala_2.12-java17-ubuntu/release.metadata deleted file mode 100644 index bc7726d..0000000 --- a/1.19/scala_2.12-java17-ubuntu/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.19.3-scala_2.12-java17, 1.19-scala_2.12-java17, scala_2.12-java17, 1.19.3-java17, 1.19-java17, java17 -Architectures: amd64,arm64v8 diff --git a/1.19/scala_2.12-java8-ubuntu/release.metadata b/1.19/scala_2.12-java8-ubuntu/release.metadata deleted file mode 100644 index f0e0c3f..0000000 --- a/1.19/scala_2.12-java8-ubuntu/release.metadata +++ /dev/null @@ -1,2 +0,0 @@ -Tags: 1.19.3-scala_2.12-java8, 1.19-scala_2.12-java8, scala_2.12-java8, 1.19.3-java8, 1.19-java8, java8 -Architectures: amd64,arm64v8 diff --git a/1.19/scala_2.12-java11-ubuntu/Dockerfile b/2.1/scala_2.12-java11-ubuntu/Dockerfile similarity index 73% rename from 1.19/scala_2.12-java11-ubuntu/Dockerfile rename to 2.1/scala_2.12-java11-ubuntu/Dockerfile index 018ec75..1bcc230 100644 --- a/1.19/scala_2.12-java11-ubuntu/Dockerfile +++ b/2.1/scala_2.12-java11-ubuntu/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.3/flink-1.19.3-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.3/flink-1.19.3-bin-scala_2.12.tgz.asc \ - GPG_KEY=CC33238850B5A92624ED7F6216AE0DDBBB2F380B \ +ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://downloads.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz.asc \ + GPG_KEY=7A14EF9AD986EF0D56B2E73F6AF817E6C59EC690 \ CHECK_GPG=true # Prepare environment @@ -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 / diff --git a/1.19/scala_2.12-java11-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh similarity index 100% rename from 1.19/scala_2.12-java11-ubuntu/docker-entrypoint.sh rename to 2.1/scala_2.12-java11-ubuntu/docker-entrypoint.sh diff --git a/2.1/scala_2.12-java11-ubuntu/release.metadata b/2.1/scala_2.12-java11-ubuntu/release.metadata new file mode 100644 index 0000000..9a25635 --- /dev/null +++ b/2.1/scala_2.12-java11-ubuntu/release.metadata @@ -0,0 +1,2 @@ +Tags: 2.1.0-scala_2.12-java11, 2.1-scala_2.12-java11, scala_2.12-java11, 2.1.0-java11, 2.1-java11, java11 +Architectures: amd64,arm64v8 diff --git a/1.19/scala_2.12-java17-ubuntu/Dockerfile b/2.1/scala_2.12-java17-ubuntu/Dockerfile similarity index 73% rename from 1.19/scala_2.12-java17-ubuntu/Dockerfile rename to 2.1/scala_2.12-java17-ubuntu/Dockerfile index e4917f7..8befbef 100644 --- a/1.19/scala_2.12-java17-ubuntu/Dockerfile +++ b/2.1/scala_2.12-java17-ubuntu/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.3/flink-1.19.3-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.3/flink-1.19.3-bin-scala_2.12.tgz.asc \ - GPG_KEY=CC33238850B5A92624ED7F6216AE0DDBBB2F380B \ +ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://downloads.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz.asc \ + GPG_KEY=7A14EF9AD986EF0D56B2E73F6AF817E6C59EC690 \ CHECK_GPG=true # Prepare environment @@ -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 / diff --git a/1.19/scala_2.12-java17-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh similarity index 100% rename from 1.19/scala_2.12-java17-ubuntu/docker-entrypoint.sh rename to 2.1/scala_2.12-java17-ubuntu/docker-entrypoint.sh diff --git a/2.1/scala_2.12-java17-ubuntu/release.metadata b/2.1/scala_2.12-java17-ubuntu/release.metadata new file mode 100644 index 0000000..8d1db1e --- /dev/null +++ b/2.1/scala_2.12-java17-ubuntu/release.metadata @@ -0,0 +1,2 @@ +Tags: 2.1.0-scala_2.12-java17, 2.1-scala_2.12-java17, scala_2.12-java17, 2.1.0-scala_2.12, 2.1-scala_2.12, scala_2.12, 2.1.0-java17, 2.1-java17, java17, 2.1.0, 2.1, latest +Architectures: amd64,arm64v8 diff --git a/1.19/scala_2.12-java8-ubuntu/Dockerfile b/2.1/scala_2.12-java21-ubuntu/Dockerfile similarity index 72% rename from 1.19/scala_2.12-java8-ubuntu/Dockerfile rename to 2.1/scala_2.12-java21-ubuntu/Dockerfile index 92778ee..3cc6f70 100644 --- a/1.19/scala_2.12-java8-ubuntu/Dockerfile +++ b/2.1/scala_2.12-java21-ubuntu/Dockerfile @@ -16,7 +16,7 @@ # limitations under the License. ############################################################################### -FROM eclipse-temurin:8-jre-jammy +FROM eclipse-temurin:21-jre-jammy # Install dependencies RUN set -ex; \ @@ -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.3/flink-1.19.3-bin-scala_2.12.tgz \ - FLINK_ASC_URL=https://downloads.apache.org/flink/flink-1.19.3/flink-1.19.3-bin-scala_2.12.tgz.asc \ - GPG_KEY=CC33238850B5A92624ED7F6216AE0DDBBB2F380B \ +ENV FLINK_TGZ_URL=https://dlcdn.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz \ + FLINK_ASC_URL=https://downloads.apache.org/flink/flink-2.1.0/flink-2.1.0-bin-scala_2.12.tgz.asc \ + GPG_KEY=7A14EF9AD986EF0D56B2E73F6AF817E6C59EC690 \ CHECK_GPG=true # Prepare environment @@ -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 / diff --git a/1.19/scala_2.12-java8-ubuntu/docker-entrypoint.sh b/2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh similarity index 100% rename from 1.19/scala_2.12-java8-ubuntu/docker-entrypoint.sh rename to 2.1/scala_2.12-java21-ubuntu/docker-entrypoint.sh diff --git a/2.1/scala_2.12-java21-ubuntu/release.metadata b/2.1/scala_2.12-java21-ubuntu/release.metadata new file mode 100644 index 0000000..fac16e7 --- /dev/null +++ b/2.1/scala_2.12-java21-ubuntu/release.metadata @@ -0,0 +1,2 @@ +Tags: 2.1.0-scala_2.12-java21, 2.1-scala_2.12-java21, scala_2.12-java21, 2.1.0-java21, 2.1-java21, java21 +Architectures: amd64,arm64v8