[flink] branch release-1.11 updated: [FLINK-18618] Use moby engine instead of docker-ce

[rm...@apache.org]

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

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


The following commit(s) were added to refs/heads/release-1.11 by this push:
     new a869481  [FLINK-18618] Use moby engine instead of docker-ce
a869481 is described below

commit a869481aac59b4b06f2811d23c0c6bb0fcf43019
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon Jul 20 13:42:50 2020 +0200

    [FLINK-18618] Use moby engine instead of docker-ce
---
 tools/azure-pipelines/jobs-template.yml |  2 --
 tools/azure-pipelines/setup_docker.sh   | 26 --------------------------
 2 files changed, 28 deletions(-)

diff --git a/tools/azure-pipelines/jobs-template.yml b/tools/azure-pipelines/jobs-template.yml
index 2930f31..1e91ed9 100644
--- a/tools/azure-pipelines/jobs-template.yml
+++ b/tools/azure-pipelines/jobs-template.yml
@@ -173,8 +173,6 @@ jobs:
         source ./tools/ci/maven-utils.sh
         setup_maven
       displayName: Setup Maven 3.2.5
-    - script: ./tools/azure-pipelines/setup_docker.sh
-      displayName: Setup Docker
     - script: ./tools/azure-pipelines/free_disk_space.sh
       displayName: Free up disk space
     - script: sudo apt-get install -y bc
diff --git a/tools/azure-pipelines/setup_docker.sh b/tools/azure-pipelines/setup_docker.sh
deleted file mode 100755
index 19eb50a..0000000
--- a/tools/azure-pipelines/setup_docker.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-echo "Replace moby by docker"
-docker version
-sudo apt-get remove -y moby-engine
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-sudo apt-get update
-sudo apt-get install -y docker-ce docker-ce-cli containerd.io
-docker version