From c30e92f2018f6149a5f4e19a4a2bbbfa0219a800 Mon Sep 17 00:00:00 2001 From: Andrii Ostapenko Date: Wed, 2 Feb 2022 10:13:13 -0700 Subject: [PATCH] Fix gates Fixes get-pip url Updates go to 1.17.6 for mini-mirror Change-Id: Ieaf35d935381416b0acd93113ed26cf981e7461b Signed-off-by: Andrii Ostapenko --- ceph-config-helper/Dockerfile.ubuntu_bionic | 2 +- ceph-daemon/Dockerfile.ubuntu_bionic | 2 +- mini-mirror/tools/install_aptly.sh | 2 +- ospurge/Dockerfile.ubuntu_bionic | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ceph-config-helper/Dockerfile.ubuntu_bionic b/ceph-config-helper/Dockerfile.ubuntu_bionic index 06131fbf..4a9f35a6 100644 --- a/ceph-config-helper/Dockerfile.ubuntu_bionic +++ b/ceph-config-helper/Dockerfile.ubuntu_bionic @@ -33,7 +33,7 @@ RUN set -ex ;\ gdisk \ udev \ jq ;\ - curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\ + curl -sSL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 ;\ pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\ pip3 --no-cache-dir install --upgrade \ crush \ diff --git a/ceph-daemon/Dockerfile.ubuntu_bionic b/ceph-daemon/Dockerfile.ubuntu_bionic index 39323d31..e11939ff 100644 --- a/ceph-daemon/Dockerfile.ubuntu_bionic +++ b/ceph-daemon/Dockerfile.ubuntu_bionic @@ -47,7 +47,7 @@ RUN set -ex ;\ uuid-runtime \ jq \ alien ;\ - curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 ;\ + curl -sSL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 ;\ pip3 --no-cache-dir install --upgrade --ignore-installed PyYAML ;\ pip3 --no-cache-dir install --upgrade \ six \ diff --git a/mini-mirror/tools/install_aptly.sh b/mini-mirror/tools/install_aptly.sh index 4a08baa7..35191c45 100755 --- a/mini-mirror/tools/install_aptly.sh +++ b/mini-mirror/tools/install_aptly.sh @@ -18,7 +18,7 @@ set -xe export APTLY_REPO=${APTLY_REPO:-"https://github.com/aptly-dev/aptly.git"} export APTLY_REFSPEC=${APTLY_REFSPEC:-"master"} -export GO_SOURCE="https://dl.google.com/go/go1.13.5.linux-amd64.tar.gz" +export GO_SOURCE="https://dl.google.com/go/go1.17.6.linux-amd64.tar.gz" function install_aptly_from_apt { tee /etc/apt/sources.list.d/aptly.list << EOF diff --git a/ospurge/Dockerfile.ubuntu_bionic b/ospurge/Dockerfile.ubuntu_bionic index 4bdd4971..03578979 100644 --- a/ospurge/Dockerfile.ubuntu_bionic +++ b/ospurge/Dockerfile.ubuntu_bionic @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.licenses='BSD-3-Clause' RUN set -xe \ && apt-get update \ && apt-get install curl python3 python3-setuptools -y \ - && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 + && curl -sSL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 RUN pip install ospurge python-openstackclient