You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/11/24 15:26:56 UTC

(flink) branch release-1.17 updated: [FLINK-18356] Update CI image

This is an automated email from the ASF dual-hosted git repository.

mapohl pushed a commit to branch release-1.17
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.17 by this push:
     new 070b170f33e [FLINK-18356] Update CI image
070b170f33e is described below

commit 070b170f33eeb92e298cf3fcfd31cb534950b824
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Nov 15 10:48:56 2023 +0100

    [FLINK-18356] Update CI image
---
 .github/workflows/docs.yml                  | 2 +-
 tools/azure-pipelines/build-apache-repo.yml | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0cf9857bb69..dc81e2b8510 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -48,7 +48,7 @@ jobs:
           fi
       - name: Build documentation
         run: |
-          docker run  --rm --volume "$PWD:/root/flink" chesnay/flink-ci:java_8_11 bash -c "cd /root/flink && ./.github/workflows/docs.sh"
+          docker run --rm --volume "$PWD:/root/flink" chesnay/flink-ci:java_8_11_17_maven_325 bash -c "cd /root/flink && ./.github/workflows/docs.sh"
       - name: Upload documentation
         uses: burnett01/rsync-deployments@5.2
         with:
diff --git a/tools/azure-pipelines/build-apache-repo.yml b/tools/azure-pipelines/build-apache-repo.yml
index 6125b0935d5..e30c7b9ae44 100644
--- a/tools/azure-pipelines/build-apache-repo.yml
+++ b/tools/azure-pipelines/build-apache-repo.yml
@@ -37,9 +37,12 @@ trigger:
 resources:
   containers:
   # Container with Maven 3.2.5, SSL to have the same environment everywhere.
-  # see https://github.com/flink-ci/flink-ci-docker
+  # see https://github.com/apache/flink-connector-shared-utils/tree/ci_utils
+  # The Docker image was customized for 1.17 to cover the changes of FLINK-18356
+  # (Docker images with updated Maven binaries are used in branches for Flink 1.18+)
+  # but still use Maven 3.2.5 (to avoid backporting FLINK-28016)
   - container: flink-build-container
-    image: chesnay/flink-ci:java_8_11_17
+    image: chesnay/flink-ci:java_8_11_17_maven_325
 
 variables:
   MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository