This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 7a0b5dc GEODE-9137: install docker-compose via pip, not a stale
ubuntu/univer… (#6300)
7a0b5dc is described below
commit 7a0b5dcc8a738687140cda6f49615f8cf927de62
Author: Robert Houghton <[email protected]>
AuthorDate: Fri Apr 9 13:04:00 2021 -0700
GEODE-9137: install docker-compose via pip, not a stale ubuntu/univer…
(#6300)
* GEODE-9137: install docker-compose via pip, not a stale ubuntu/universe
repo
(cherry picked from commit 2d881664bf5a945f926cdeb5cc53d77053faf189)
---
ci/images/google-geode-builder/scripts/setup.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/ci/images/google-geode-builder/scripts/setup.sh
b/ci/images/google-geode-builder/scripts/setup.sh
index db2e094..28133b2 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -39,7 +39,6 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y
--no-install-recommends \
aptitude \
ca-certificates \
cgroupfs-mount \
- docker-compose \
containerd.io \
docker-ce="5:19.03.14~3-0~ubuntu-bionic" \
docker-ce-cli="5:19.03.14~3-0~ubuntu-bionic" \
@@ -67,6 +66,10 @@ apt-get install -y --no-install-recommends \
rm -rf /etc/alternatives
mv /etc/keep-alternatives /etc/alternatives
+pip3 install --upgrade pip
+pip3 install setuptools
+pip3 install docker-compose
+
pushd /tmp
curl -O
https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz
tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz -C /
