This is an automated email from the ASF dual-hosted git repository. mbalassi pushed a commit to branch release-1.15.2.4-acs in repository https://gitbox.apache.org/repos/asf/flink.git
commit fc021007311fbc0c05f2f831d2ff04979e846225 Author: Gabor Somogyi <[email protected]> AuthorDate: Fri Sep 9 15:31:47 2022 +0200 [apple] Release rio.yml bump patch fix --- apple/release_rio_bump.patch.template | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/apple/release_rio_bump.patch.template b/apple/release_rio_bump.patch.template index 3c888d6b643..fadf29657ff 100644 --- a/apple/release_rio_bump.patch.template +++ b/apple/release_rio_bump.patch.template @@ -12,8 +12,8 @@ index c5d8c8e6adf..e647cf3949f 100644 + branchName: release-${RELEASE_VERSION} machine: baseImage: docker.apple.com/thomas-weise/flink-ci:latest - build: -@@ -21,7 +21,7 @@ pipelines: + env: +@@ -23,7 +23,7 @@ pipelines: - pushd /workspace/apple/docker; wget https://archive.apache.org/dist/hadoop/common/hadoop-3.3.1/hadoop-3.3.1.tar.gz; popd package: # enable for release (non -SNAPSHOT) builds @@ -22,8 +22,9 @@ index c5d8c8e6adf..e647cf3949f 100644 freeform: - publish: - repo: m2:oss-patched -@@ -29,20 +29,18 @@ pipelines: - - dockerfilePath: apple/docker/Dockerfile.base +@@ -31,22 +31,20 @@ pipelines: + - dockerfilePath: apple/docker/Dockerfile + target: base context: apple/docker/ perApplication: false - version: "${PATCH_VERSION}-r${RIO_BUILD_NUMBER}" @@ -31,7 +32,8 @@ index c5d8c8e6adf..e647cf3949f 100644 + version: "${PATCH_VERSION}.${ACS_VERSION}" publish: - repo: docker.apple.com/acs-flink/flink-1.${MINOR_VERSION}-acs - - dockerfilePath: apple/docker/Dockerfile.hadoop + - dockerfilePath: apple/docker/Dockerfile + target: hadoop context: apple/docker/ perApplication: false - version: "${PATCH_VERSION}-r${RIO_BUILD_NUMBER}" @@ -47,7 +49,7 @@ index c5d8c8e6adf..e647cf3949f 100644 machine: baseImage: docker.apple.com/thomas-weise/flink-ci:latest build: -@@ -60,19 +58,7 @@ pipelines: +@@ -64,19 +62,7 @@ pipelines: - ci stage-lib "flink-$TIMED_VERSION.tgz,snapshot/org/apache/flink/flink-dist/$VERSION/" package: # enable for release (non -SNAPSHOT) builds
