Procházet zdrojové kódy

Merge pull request #9194 from flavio/update_installation_docs

Update installation docs
Sven Dowideit před 10 roky
rodič
revize
595cd5279e
2 změnil soubory, kde provedl 20 přidání a 21 odebrání
  1. 1 1
      docs/sources/installation.md
  2. 19 20
      docs/sources/installation/SUSE.md

+ 1 - 1
docs/sources/installation.md

@@ -16,7 +16,7 @@ techniques for installing Docker all the time.
  - [Arch Linux](archlinux/)
  - [CRUX Linux](cruxlinux/)
  - [Gentoo](gentoolinux/)
- - [openSUSE](openSUSE/)
+ - [openSUSE and SUSE Linux Enterprise](SUSE/)
  - [FrugalWare](frugalware/)
  - [Mac OS X](mac/)
  - [Windows](windows/)

+ 19 - 20
docs/sources/installation/openSUSE.md → docs/sources/installation/SUSE.md

@@ -1,40 +1,39 @@
-page_title: Installation on openSUSE
-page_description: Installation instructions for Docker on openSUSE.
-page_keywords: openSUSE, virtualbox, docker, documentation, installation
+page_title: Installation on openSUSE and SUSE Linux Enterprise
+page_description: Installation instructions for Docker on openSUSE and on SUSE Linux Enterprise.
+page_keywords: openSUSE, SUSE Linux Enterprise, SUSE, SLE, docker, documentation, installation
 
 # openSUSE
 
 Docker is available in **openSUSE 12.3 and later**. Please note that due
-to the current Docker limitations Docker is able to run only on the **64
-bit** architecture.
+to its current limitations Docker is able to run only **64 bit** architecture.
 
-## Installation
+Docker is not part of the official repositories of openSUSE 12.3 and
+openSUSE 13.1. Hence  it is neccessary to add the [Virtualization
+repository](https://build.opensuse.org/project/show/Virtualization) from
+[OBS](https://build.opensuse.org/) to install the `docker` package.
 
-The `docker` package from the [Virtualization
-project](https://build.opensuse.org/project/show/Virtualization) on
-[OBS](https://build.opensuse.org/) provides Docker on openSUSE.
-
-To proceed with Docker installation please add the right Virtualization
-repository.
+Execute one of the following commands to add the Virtualization repository:
 
     # openSUSE 12.3
     $ sudo zypper ar -f http://download.opensuse.org/repositories/Virtualization/openSUSE_12.3/ Virtualization
-    $ sudo rpm --import http://download.opensuse.org/repositories/Virtualization/openSUSE_12.3/repodata/repomd.xml.key
 
     # openSUSE 13.1
     $ sudo zypper ar -f http://download.opensuse.org/repositories/Virtualization/openSUSE_13.1/ Virtualization
-    $ sudo rpm --import http://download.opensuse.org/repositories/Virtualization/openSUSE_13.1/repodata/repomd.xml.key
+
+No extra repository is required for openSUSE 13.2 and later.
+
+# SUSE Linux Enterprise
+
+Docker is available in **SUSE Linux Enterprise 12 and later**. Please note that
+due to its current limitations Docker is able to run only on **64 bit**
+architecture.
+
+# Installation
 
 Install the Docker package.
 
     $ sudo zypper in docker
 
-It's also possible to install Docker using openSUSE's1-click install.
-Just visit [this](http://software.opensuse.org/package/docker) page,
-select your openSUSE version and click on the installation link. This
-will add the right repository to your system and it will also install
-the docker package.
-
 Now that it's installed, let's start the Docker daemon.
 
     $ sudo systemctl start docker