From 1f3f3e08bc8fa33cf34541f408df4975c787367b Mon Sep 17 00:00:00 2001 From: Davlet Panech Date: Mon, 14 Dec 2020 10:01:45 -0500 Subject: [PATCH] Update CentOS vault URL to HTTPS CentOS vault HTTP url redirects to HTTPS, but yum displays misleading error messages when the secondary HTTPS request fails. Use HTTPS directly. Change-Id: I687c1de2378de11abb5ad981bc73b66d8c40ba2a Closes-Bug: 1908088 Signed-off-by: Davlet Panech --- Dockerfile | 2 +- centos-mirror-tools/dl_other_from_centos_repo.sh | 2 +- centos-mirror-tools/utils_tests.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8042541fc..eba205a2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ ARG MYUNAME=builder ARG MYUID=1000 # CentOS & EPEL URLs that match the base image # Override these with --build-arg if you have a mirror -ARG CENTOS_7_8_URL=http://vault.centos.org/centos/7.8.2003 +ARG CENTOS_7_8_URL=https://vault.centos.org/centos/7.8.2003 ARG EPEL_7_8_URL=https://archives.fedoraproject.org/pub/archive/epel/7.2020-04-20 ARG MY_EMAIL= diff --git a/centos-mirror-tools/dl_other_from_centos_repo.sh b/centos-mirror-tools/dl_other_from_centos_repo.sh index caa46e9df..d16e7dc43 100755 --- a/centos-mirror-tools/dl_other_from_centos_repo.sh +++ b/centos-mirror-tools/dl_other_from_centos_repo.sh @@ -5,7 +5,7 @@ # # -# Download non-RPM files from http://vault.centos.org/7.4.1708/os/x86_64/ +# Download non-RPM files from https://vault.centos.org/7.4.1708/os/x86_64/ # DL_OTHER_FROM_CENTOS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )" diff --git a/centos-mirror-tools/utils_tests.sh b/centos-mirror-tools/utils_tests.sh index 8a7da11dd..1ffab382e 100644 --- a/centos-mirror-tools/utils_tests.sh +++ b/centos-mirror-tools/utils_tests.sh @@ -40,7 +40,7 @@ check_result "$res" "$expect" # get_url res=$(get_url "acpid-2.0.19-9.el7.x86_64.rpm" "L1") -expect="http://vault.centos.org/centos/7.4.1708/cr/x86_64/Packages/acpid-2.0.19-9.el7.x86_64.rpm" +expect="https://vault.centos.org/centos/7.4.1708/cr/x86_64/Packages/acpid-2.0.19-9.el7.x86_64.rpm" check_result "$res" "$expect" res=$(get_url "python2-httpbin-0.5.0-6.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-httpbin/0.5.0/6.el7/noarch/python2-httpbin-0.5.0-6.el7.noarch.rpm" "L1")