From 8dbc8f134f28e3b3af72ba35b3d88386207769d5 Mon Sep 17 00:00:00 2001 From: tang0th Date: Fri, 6 Dec 2013 15:47:24 +0000 Subject: [PATCH] Update archlinux.rst as packages have changed The docker package has been added into the Arch Linux community repo, this means that the package names and installation instructions have slightly changed. Upstream-commit: 02ef8ec3ca1a9b16b905b671ade74cf24d11bb3a Component: engine --- .../docs/sources/installation/archlinux.rst | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/components/engine/docs/sources/installation/archlinux.rst b/components/engine/docs/sources/installation/archlinux.rst index ae56badf4c..44249b178f 100644 --- a/components/engine/docs/sources/installation/archlinux.rst +++ b/components/engine/docs/sources/installation/archlinux.rst @@ -12,21 +12,22 @@ Arch Linux .. include:: install_unofficial.inc Installing on Arch Linux is not officially supported but can be handled via -one of the following AUR packages: +the package in community: -* `lxc-docker `_ -* `lxc-docker-git `_ -* `lxc-docker-nightly `_ +* `docker `_ -The lxc-docker package will install the latest tagged version of docker. -The lxc-docker-git package will build from the current master branch. -The lxc-docker-nightly package will install the latest build. +or the following AUR package: + +* `docker-git `_ + +The docker package will install the latest tagged version of docker. +The docker-git package will build from the current master branch. Dependencies ------------ Docker depends on several packages which are specified as dependencies in -the AUR packages. The core dependencies are: +the packages. The core dependencies are: * bridge-utils * device-mapper @@ -37,15 +38,23 @@ the AUR packages. The core dependencies are: Installation ------------ +For the normal package a simple +:: + + pacman -S docker + +is all that is needed. + +For the AUR package execute: +:: + + yaourt -S lxc-docker-git + The instructions here assume **yaourt** is installed. See `Arch User Repository `_ for information on building and installing packages from the AUR if you have not done so before. -:: - - yaourt -S lxc-docker - Starting Docker ---------------