Browse Source

Merge branch 'master' of ssh://github.com/dotcloud/docker

Solomon Hykes 12 years ago
parent
commit
15c7e72e2a
2 changed files with 47 additions and 6 deletions
  1. 22 6
      docs/sources/installation/archlinux.rst
  2. 25 0
      packaging/archlinux/README.archlinux

+ 22 - 6
docs/sources/installation/archlinux.rst

@@ -6,16 +6,16 @@ Arch Linux
 Installing on Arch Linux is not officially supported but can be handled via 
 Installing on Arch Linux is not officially supported but can be handled via 
 either of the following AUR packages:
 either of the following AUR packages:
 
 
-* `dotcloud-docker <https://aur.archlinux.org/packages/dotcloud-docker/>`_
-* `dotcloud-docker-git <https://aur.archlinux.org/packages/dotcloud-docker-git/>`_
+* `lxc-docker <https://aur.archlinux.org/packages/lxc-docker/>`_
+* `lxc-docker-git <https://aur.archlinux.org/packages/lxc-docker-git/>`_
 
 
-The dotcloud-docker package will install the latest tagged version of docker. 
-The dotcloud-docker-git package will build from the current master branch.
+The lxc-docker package will install the latest tagged version of docker. 
+The lxc-docker-git package will build from the current master branch.
 
 
 Dependencies
 Dependencies
 ------------
 ------------
 
 
-Docker depends on several packages which will be installed automatically with
+Docker depends on several packages which are specified as dependencies in
 either AUR package.
 either AUR package.
 
 
 * aufs3
 * aufs3
@@ -23,6 +23,7 @@ either AUR package.
 * go
 * go
 * iproute2
 * iproute2
 * linux-aufs_friendly
 * linux-aufs_friendly
+* lxc
 
 
 Installation
 Installation
 ------------
 ------------
@@ -37,7 +38,22 @@ new kernel will be compiled and this can take quite a while.
 
 
 ::
 ::
 
 
-    yaourt -S dotcloud-docker-git
+    yaourt -S lxc-docker-git
+
+Starting Docker
+---------------
 
 
 Prior to starting docker modify your bootloader to use the 
 Prior to starting docker modify your bootloader to use the 
 **linux-aufs_friendly** kernel and reboot your system.
 **linux-aufs_friendly** kernel and reboot your system.
+
+There is a systemd service unit created for docker.  To start the docker service:
+
+::
+
+    sudo systemctl start docker
+
+To start on system boot:
+
+::
+
+    sudo systemctl enable docker

+ 25 - 0
packaging/archlinux/README.archlinux

@@ -0,0 +1,25 @@
+Docker on Arch
+==============
+
+The AUR lxc-docker and lxc-docker-git packages handle building docker on Arch
+linux.  The PKGBUILD specifies all dependencies, build, and packaging steps.
+
+Dependencies
+============
+
+The only buildtime dependencies are git and go which are available via pacman.
+The -s flag can be used on makepkg commands below to automatically install
+these dependencies.
+
+Building Package
+================
+
+Download the tarball for either AUR packaged to a local directory.  In that
+directory makepkg can be run to build the package.
+
+# Build the binary package
+makepkg
+
+# Build an updated source tarball
+makepkg --source
+