Merge "Allow disto-specific mirror settings"
This commit is contained in:
commit
074a10fd74
@ -3,3 +3,7 @@ export DIB_RELEASE=${DIB_RELEASE:-GenericCloud}
|
|||||||
|
|
||||||
# Useful for elements that work with fedora (dnf) & centos
|
# Useful for elements that work with fedora (dnf) & centos
|
||||||
export YUM=${YUM:-yum}
|
export YUM=${YUM:-yum}
|
||||||
|
|
||||||
|
if [ -n "${DIB_CENTOS_DISTRIBUTION_MIRROR:-}" ]; then
|
||||||
|
export DIB_DISTRIBUTION_MIRROR=$DIB_CENTOS_DISTRIBUTION_MIRROR
|
||||||
|
fi
|
||||||
|
@ -6,10 +6,12 @@ fi
|
|||||||
set -eu
|
set -eu
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
|
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://mirror.centos.org/centos}
|
||||||
|
|
||||||
cat << EOF > /etc/yum.repos.d/centos6-latest.repo
|
cat << EOF > /etc/yum.repos.d/centos6-latest.repo
|
||||||
[rhel6]
|
[rhel6]
|
||||||
name=centos6
|
name=centos6
|
||||||
baseurl=http://mirror.centos.org/centos/6/os/x86_64/
|
baseurl=$DIB_DISTRIBUTION_MIRROR/6/os/x86_64/
|
||||||
enabled=1
|
enabled=1
|
||||||
metadata_expire=7d
|
metadata_expire=7d
|
||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
|
@ -3,3 +3,7 @@ export DIB_RELEASE=GenericCloud
|
|||||||
|
|
||||||
# Useful for elements that work with fedora (dnf) & centos
|
# Useful for elements that work with fedora (dnf) & centos
|
||||||
export YUM=${YUM:-yum}
|
export YUM=${YUM:-yum}
|
||||||
|
|
||||||
|
if [ -n "${DIB_CENTOS_DISTRIBUTION_MIRROR:-}" ]; then
|
||||||
|
export DIB_DISTRIBUTION_MIRROR=$DIB_CENTOS_DISTRIBUTION_MIRROR
|
||||||
|
fi
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
export DISTRO_NAME=debian
|
export DISTRO_NAME=debian
|
||||||
export DIB_RELEASE=${DIB_RELEASE:-stable}
|
export DIB_RELEASE=${DIB_RELEASE:-stable}
|
||||||
|
|
||||||
|
if [ -n "${DIB_DEBIAN_DISTRIBUTION_MIRROR:-}" ]; then
|
||||||
|
DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_DISTRIBUTION_MIRROR
|
||||||
|
fi
|
||||||
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian}
|
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://ftp.us.debian.org/debian}
|
||||||
|
|
||||||
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
|
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
|
||||||
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
|
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
|
||||||
|
|
||||||
|
@ -1,2 +1,5 @@
|
|||||||
export DISTRO_NAME=fedora
|
export DISTRO_NAME=fedora
|
||||||
export DIB_RELEASE=${DIB_RELEASE:-24}
|
export DIB_RELEASE=${DIB_RELEASE:-24}
|
||||||
|
if [ -n "${DIB_FEDORA_DISTRIBUTION_MIRROR:-}" ]; then
|
||||||
|
export DIB_DISTRIBUTION_MIRROR=$DIB_FEDORA_DISTRIBUTION_MIRROR
|
||||||
|
fi
|
||||||
|
@ -1,4 +1,8 @@
|
|||||||
export DISTRO_NAME=ubuntu
|
export DISTRO_NAME=ubuntu
|
||||||
export DIB_RELEASE=${DIB_RELEASE:-xenial}
|
export DIB_RELEASE=${DIB_RELEASE:-xenial}
|
||||||
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,restricted,universe}
|
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main,restricted,universe}
|
||||||
|
|
||||||
|
if [ -n "${DIB_UBUNTU_DISTRIBUTION_MIRROR:-}" ]; then
|
||||||
|
DIB_DISTRIBUTION_MIRROR=$DIB_UBUNTU_DISTRIBUTION_MIRROR
|
||||||
|
fi
|
||||||
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://archive.ubuntu.com/ubuntu}
|
export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://archive.ubuntu.com/ubuntu}
|
||||||
|
Loading…
Reference in New Issue
Block a user