Browse code

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.

tang0th authored on 2013/12/07 00:47:24
Showing 1 changed files
... ...
@@ -12,21 +12,22 @@ Arch Linux
12 12
 .. include:: install_unofficial.inc
13 13
 
14 14
 Installing on Arch Linux is not officially supported but can be handled via 
15
-one of the following AUR packages:
15
+the package in community:
16 16
 
17
-* `lxc-docker <https://aur.archlinux.org/packages/lxc-docker/>`_
18
-* `lxc-docker-git <https://aur.archlinux.org/packages/lxc-docker-git/>`_
19
-* `lxc-docker-nightly <https://aur.archlinux.org/packages/lxc-docker-nightly/>`_
17
+* `docker <https://www.archlinux.org/packages/community/x86_64/docker/>`_
20 18
 
21
-The lxc-docker package will install the latest tagged version of docker. 
22
-The lxc-docker-git package will build from the current master branch.
23
-The lxc-docker-nightly package will install the latest build.
19
+or the following AUR package:
20
+
21
+* `docker-git <https://aur.archlinux.org/packages/docker-git/>`_
22
+
23
+The docker package will install the latest tagged version of docker. 
24
+The docker-git package will build from the current master branch.
24 25
 
25 26
 Dependencies
26 27
 ------------
27 28
 
28 29
 Docker depends on several packages which are specified as dependencies in
29
-the AUR packages. The core dependencies are:
30
+the packages. The core dependencies are:
30 31
 
31 32
 * bridge-utils
32 33
 * device-mapper
... ...
@@ -37,15 +38,23 @@ the AUR packages. The core dependencies are:
37 37
 Installation
38 38
 ------------
39 39
 
40
+For the normal package a simple
41
+::
42
+
43
+    pacman -S docker
44
+    
45
+is all that is needed.
46
+
47
+For the AUR package execute:
48
+::
49
+
50
+    yaourt -S lxc-docker-git
51
+    
40 52
 The instructions here assume **yaourt** is installed.  See 
41 53
 `Arch User Repository <https://wiki.archlinux.org/index.php/Arch_User_Repository#Installing_packages>`_
42 54
 for information on building and installing packages from the AUR if you have not
43 55
 done so before.
44 56
 
45
-::
46
-
47
-    yaourt -S lxc-docker
48
-
49 57
 
50 58
 Starting Docker
51 59
 ---------------