Procházet zdrojové kódy

Merge pull request #18029 from mmckinst/stop_hardcode_el_version

use variable instead of hardcoding version in repo
Sebastiaan van Stijn před 9 roky
rodič
revize
49f982b7ba
2 změnil soubory, kde provedl 4 přidání a 17 odebrání
  1. 2 2
      docs/installation/centos.md
  2. 2 15
      docs/installation/fedora.md

+ 2 - 2
docs/installation/centos.md

@@ -53,10 +53,10 @@ package manager.
 
 3. Add the yum repo.
 
-        $ sudo tee /etc/yum.repos.d/docker.repo <<-EOF
+        $ sudo tee /etc/yum.repos.d/docker.repo <<-'EOF'
         [dockerrepo]
         name=Docker Repository
-        baseurl=https://yum.dockerproject.org/repo/main/centos/7
+        baseurl=https://yum.dockerproject.org/repo/main/centos/$releasever/
         enabled=1
         gpgcheck=1
         gpgkey=https://yum.dockerproject.org/gpg

+ 2 - 15
docs/installation/fedora.md

@@ -46,23 +46,10 @@ There are two ways to install Docker Engine.  You can install with the `yum` pac
 
 3. Add the yum repo yourself.
 
-    For Fedora 21 run:
-
-        $ sudo tee /etc/yum.repos.d/docker.repo <<-EOF
-        [dockerrepo]
-        name=Docker Repository
-        baseurl=https://yum.dockerproject.org/repo/main/fedora/21
-        enabled=1
-        gpgcheck=1
-        gpgkey=https://yum.dockerproject.org/gpg
-        EOF
-
-    For Fedora 22 run:
-
-        $ cat >/etc/yum.repos.d/docker.repo <<-EOF
+        $ sudo tee /etc/yum.repos.d/docker.repo <<-'EOF'
         [dockerrepo]
         name=Docker Repository
-        baseurl=https://yum.dockerproject.org/repo/main/fedora/22
+        baseurl=https://yum.dockerproject.org/repo/main/fedora/$releasever/
         enabled=1
         gpgcheck=1
         gpgkey=https://yum.dockerproject.org/gpg