Use /etc/os-release to determine distro
Contents of /etc/os-release on Amazon Linux AMI 2014.09:
NAME="Amazon Linux AMI"
VERSION="2014.09"
ID="amzn"
ID_LIKE="rhel fedora"
VERSION_ID="2014.09"
PRETTY_NAME="Amazon Linux AMI 2014.09"
ANSI_COLOR="0;33"
CPE_NAME="cpe:/o:amazon:linux:2014.09:ga"
HOME_URL="http://aws.amazon.com/amazon-linux-ami/"
Signed-off-by: Amit Bakshi <ambakshi@gmail.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
| ... | ... |
@@ -75,13 +75,23 @@ fi |
| 75 | 75 |
if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then |
| 76 | 76 |
lsb_dist='Fedora' |
| 77 | 77 |
fi |
| 78 |
+if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then |
|
| 79 |
+ lsb_dist="$(. /etc/os-release && echo "$NAME" | cut -d' ' -f1)" |
|
| 80 |
+fi |
|
| 78 | 81 |
|
| 79 | 82 |
case "$lsb_dist" in |
| 80 |
- Fedora) |
|
| 81 |
- ( |
|
| 82 |
- set -x |
|
| 83 |
- $sh_c 'sleep 3; yum -y -q install docker-io' |
|
| 84 |
- ) |
|
| 83 |
+ Amazon|Fedora) |
|
| 84 |
+ if [ "$lsb_dist" = 'Amazon' ]; then |
|
| 85 |
+ ( |
|
| 86 |
+ set -x |
|
| 87 |
+ $sh_c 'sleep 3; yum -y -q install docker' |
|
| 88 |
+ ) |
|
| 89 |
+ else |
|
| 90 |
+ ( |
|
| 91 |
+ set -x |
|
| 92 |
+ $sh_c 'sleep 3; yum -y -q install docker-io' |
|
| 93 |
+ ) |
|
| 94 |
+ fi |
|
| 85 | 95 |
if command_exists docker && [ -e /var/run/docker.sock ]; then |
| 86 | 96 |
( |
| 87 | 97 |
set -x |