docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issues with get.docker.com install script with redhat fixes #23101 

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
This commit is contained in:
Ken Cochrane 2016-05-31 08:44:40 -04:00
parent ba372df79c
commit dcc407a820
No known key found for this signature in database
GPG Key ID: E74D22C603E63701
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hack/install.sh Executable file → Normal file
View File

@ -239,10 +239,11 @@ do_install() {
if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then
lsb_dist='oracleserver' lsb_dist='oracleserver'
fi fi
if [ -z "$lsb_dist" ]; then if [ -z "$lsb_dist" ] && [ -r /etc/centos-release ]; then
if [ -r /etc/centos-release ] || [ -r /etc/redhat-release ]; then lsb_dist='centos'
lsb_dist='centos' fi
fi if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then
lsb_dist='redhat'
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")"
@ -279,8 +280,8 @@ do_install() {
dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
;; ;;
fedora|centos) fedora|centos|redhat)
dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')" dist_version="$(rpm -q --whatprovides ${lsb_dist}-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//' | sort | tail -1)"
;; ;;
*) *)
@ -435,7 +436,7 @@ do_install() {
exit 0 exit 0
;; ;;
fedora|centos|oraclelinux) fedora|centos|redhat|oraclelinux)
$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