From e72192be404c9a8489191d43fd6e5c429081d5c8 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 21 Jan 2016 01:27:46 +1100 Subject: [PATCH] *: remove documentation references to dockerinit While the documentation is very patchy on dockerinit, remove all references in packaging documentation to the now purged dockerinit. Signed-off-by: Aleksa Sarai --- project/PACKAGERS.md | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/project/PACKAGERS.md b/project/PACKAGERS.md index 780e96181c..3ca75e7623 100644 --- a/project/PACKAGERS.md +++ b/project/PACKAGERS.md @@ -210,7 +210,7 @@ the file "./VERSION". This binary is usually installed somewhere like ### Dynamic Daemon / Client-only Binary -If you are only interested in a Docker client binary, set `DOCKER_CLIENTONLY` to a non-empty value using something similar to the following: (which will prevent the extra step of compiling dockerinit) +If you are only interested in a Docker client binary, set `DOCKER_CLIENTONLY` to a non-empty value using something similar to the following: ```bash export DOCKER_CLIENTONLY=1 @@ -228,37 +228,6 @@ following: This will create "./bundles/$VERSION/dynbinary/docker-$VERSION", which for client-only builds is the important file to grab and install as appropriate. -For daemon builds, you will also need to grab and install -"./bundles/$VERSION/dynbinary/dockerinit-$VERSION", which is created from the -minimal set of Docker's codebase that _must_ be compiled statically (and is thus -a pure static binary). The acceptable locations Docker will search for this file -are as follows (in order): - -* as "dockerinit" in the same directory as the daemon binary (ie, if docker is - installed at "/usr/bin/docker", then "/usr/bin/dockerinit" will be the first - place this file is searched for) -* "/usr/libexec/docker/dockerinit" or "/usr/local/libexec/docker/dockerinit" - ([FHS 3.0 Draft](https://www.linuxbase.org/betaspecs/fhs/fhs.html#usrlibexec)) -* "/usr/lib/docker/dockerinit" or "/usr/local/lib/docker/dockerinit" ([FHS - 2.3](https://refspecs.linuxfoundation.org/FHS_2.3/fhs-2.3.html#USRLIBLIBRARIESFORPROGRAMMINGANDPA)) - -If (and please, only if) one of the paths above is insufficient due to distro -policy or similar issues, you may use the `DOCKER_INITPATH` environment variable -at compile-time as follows to set a different path for Docker to search: - -```bash -export DOCKER_INITPATH=/usr/lib/docker.io/dockerinit -``` - -If you find yourself needing this, please don't hesitate to reach out to Tianon -to see if it would be reasonable or helpful to add more paths to Docker's list, -especially if there's a relevant standard worth referencing (such as the FHS). - -Also, it goes without saying, but for the purposes of the daemon please consider -these two binaries ("docker" and "dockerinit") as if they were a single unit. -Mixing and matching can cause undesired consequences, and will fail to run -properly. - ## System Dependencies ### Runtime Dependencies