mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix installation script for RHEL
the previous fix changed the lsb_dist variable too early. We only normalize to "centos" for the repository-location, so changing it just before that. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
4cad55026a
commit
73d5f0648e
1 changed files with 5 additions and 2 deletions
|
@ -243,8 +243,7 @@ do_install() {
|
||||||
lsb_dist='centos'
|
lsb_dist='centos'
|
||||||
fi
|
fi
|
||||||
if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then
|
if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then
|
||||||
# we use centos for both redhat and centos releases
|
lsb_dist='redhat'
|
||||||
lsb_dist='centos'
|
|
||||||
fi
|
fi
|
||||||
if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
|
if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
|
||||||
lsb_dist="$(. /etc/os-release && echo "$ID")"
|
lsb_dist="$(. /etc/os-release && echo "$ID")"
|
||||||
|
@ -438,6 +437,10 @@ do_install() {
|
||||||
;;
|
;;
|
||||||
|
|
||||||
fedora|centos|redhat|oraclelinux)
|
fedora|centos|redhat|oraclelinux)
|
||||||
|
if [ "${lsb_dist}" = "redhat" ]; then
|
||||||
|
# we use the centos repository for both redhat and centos releases
|
||||||
|
lsb_dist='centos'
|
||||||
|
fi
|
||||||
$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
|
$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
|
||||||
[docker-${repo}-repo]
|
[docker-${repo}-repo]
|
||||||
name=Docker ${repo} Repository
|
name=Docker ${repo} Repository
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue