[geode] branch develop updated: GEODE-8334: OS changes (#5917)

[on...@apache.org]

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

onichols pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new a921254  GEODE-8334: OS changes (#5917)
a921254 is described below

commit a921254fdd2b468d5255cb59e99cdfcd66d3d87f
Author: Sean Goller <se...@goller.net>
AuthorDate: Fri Jan 15 16:44:59 2021 -0800

    GEODE-8334: OS changes (#5917)
    
    * Update Ubuntu to 20.04
    * Use docker 19.03.14 because of breaking API changes.
---
 ci/images/google-geode-builder/scripts/setup.sh | 4 +++-
 ci/pipelines/images/deploy_images_pipeline.sh   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 78b0f47..1aca957 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -40,7 +40,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     ca-certificates \
     cgroupfs-mount \
     docker-compose \
-    docker-ce \
+    containerd.io \
+    docker-ce="5:19.03.14~3-0~ubuntu-focal" \
+    docker-ce-cli="5:19.03.14~3-0~ubuntu-focal" \
     git \
     google-chrome-stable \
     htop \
diff --git a/ci/pipelines/images/deploy_images_pipeline.sh b/ci/pipelines/images/deploy_images_pipeline.sh
index a6f5c4d..3ee1327 100755
--- a/ci/pipelines/images/deploy_images_pipeline.sh
+++ b/ci/pipelines/images/deploy_images_pipeline.sh
@@ -72,7 +72,7 @@ pipeline-prefix: "${PIPELINE_PREFIX}"
 public-pipelines: ${PUBLIC_PIPELINES}
 gcp-project: ${GCP_PROJECT}
 windows-base-family: windows-2016
-linux-base-family: ubuntu-minimal-1804-lts
+linux-base-family: ubuntu-minimal-2004-lts
 YML