From d370a889c37b762a8ddf7e29a8e666fd7cedec3d Mon Sep 17 00:00:00 2001 From: dkumor Date: Tue, 26 Nov 2013 20:00:13 -0600 Subject: [PATCH 1/3] Deleted references to AUFS AUFS is no longer a dependency (both lxc-docker and lxc-docker-git are >=0.7), and the Arch kernel doesn't need to be replaced with AUFS_friendly. --- docs/sources/installation/archlinux.rst | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/sources/installation/archlinux.rst b/docs/sources/installation/archlinux.rst index d6dc239253..d34dc6a209 100644 --- a/docs/sources/installation/archlinux.rst +++ b/docs/sources/installation/archlinux.rst @@ -30,7 +30,6 @@ either AUR package. * bridge-utils * go * iproute2 -* linux-aufs_friendly * lxc Installation @@ -41,9 +40,6 @@ The instructions here assume **yaourt** is installed. See for information on building and installing packages from the AUR if you have not done so before. -Keep in mind that if **linux-aufs_friendly** is not already installed that a -new kernel will be compiled and this can take quite a while. - :: yaourt -S lxc-docker-git @@ -52,9 +48,6 @@ new kernel will be compiled and this can take quite a while. Starting Docker --------------- -Prior to starting docker modify your bootloader to use the -**linux-aufs_friendly** kernel and reboot your system. - There is a systemd service unit created for docker. To start the docker service: :: From b3e8ba19085732d9f633e4cbddb660f5f8dc5462 Mon Sep 17 00:00:00 2001 From: dkumor Date: Tue, 26 Nov 2013 22:07:56 -0600 Subject: [PATCH 2/3] Arch docs: Updated dependencies to match AUR The AUR packages lxc-docker and lxc-docker-git have changed their dependencies. --- docs/sources/installation/archlinux.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/installation/archlinux.rst b/docs/sources/installation/archlinux.rst index d34dc6a209..e415295918 100644 --- a/docs/sources/installation/archlinux.rst +++ b/docs/sources/installation/archlinux.rst @@ -26,8 +26,8 @@ Dependencies Docker depends on several packages which are specified as dependencies in either AUR package. -* aufs3 * bridge-utils +* device-mapper * go * iproute2 * lxc From 682a188ead44e93ac3d5cc53c708808fa7d2fe4f Mon Sep 17 00:00:00 2001 From: dkumor Date: Wed, 27 Nov 2013 10:25:30 -0600 Subject: [PATCH 3/3] Arch docs: Added lxc-docker-nightly AUR package, modified deps lxc-docker-nightly installs latest build. Removed go from dependencies, as it is not needed in lxc-docker and lxc-docker-nightly. The -git package will flag go as a dependency upon installation. --- docs/sources/installation/archlinux.rst | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/sources/installation/archlinux.rst b/docs/sources/installation/archlinux.rst index e415295918..ae56badf4c 100644 --- a/docs/sources/installation/archlinux.rst +++ b/docs/sources/installation/archlinux.rst @@ -12,26 +12,28 @@ Arch Linux .. include:: install_unofficial.inc Installing on Arch Linux is not officially supported but can be handled via -either of the following AUR packages: +one of the following AUR packages: * `lxc-docker `_ * `lxc-docker-git `_ +* `lxc-docker-nightly `_ 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. Dependencies ------------ Docker depends on several packages which are specified as dependencies in -either AUR package. +the AUR packages. The core dependencies are: * bridge-utils * device-mapper -* go * iproute2 * lxc + Installation ------------ @@ -42,7 +44,7 @@ done so before. :: - yaourt -S lxc-docker-git + yaourt -S lxc-docker Starting Docker