Merge "Update CentOS vault URL to HTTPS"

This commit is contained in:
Zuul 2020-12-14 16:56:26 +00:00 committed by Gerrit Code Review
commit a2194c6ca7
3 changed files with 3 additions and 3 deletions

View File

@ -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=

View File

@ -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]}" )" )"

View File

@ -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")