summaryrefslogtreecommitdiff
path: root/hack/make/dynbinary
Commit message (Collapse)AuthorAgeFilesLines
* Move proxy build into hack/makeBrian Goff2021-06-011-0/+2
| | | | Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* hack: fix mixed tabs/spaces for indentationSebastiaan van Stijn2019-08-021-4/+3
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Remove cmd/docker and other directories in cli/ in accordance with the new ↵Arnaud Porterie (icecrime)2017-05-051-5/+0
| | | | | | | | | | | | | | | | | | | Moby project scope Starting with this commit, integration tests should no longer rely on the docker cli, they should be API tests instead. For the existing tests the scripts will use a frozen version of the docker cli with a DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains green at all times. To help contributors develop and test manually with a modified docker cli, this commit also adds a DOCKER_CLI_PATH environment variable to the Makefile. This allows to set the path of a custom cli that will be available inside the development container and used to run the integration tests. Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com> Signed-off-by: Tibor Vass <tibor@docker.com>
* Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"Tianon Gravi2017-02-131-1/+1
| | | | | | This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* Fix spelling in comments, strings and documentationOtto Kekäläinen2016-07-031-1/+1
| | | | Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
* Build two binaries client and daemon.Daniel Nephin2016-04-221-5/+10
| | | | | | | | | | | | | Add a proxy to support 'docker daemon' Fix configFile option, and remove a test that is no longer relevant. Remove daemon build tag. Remove DOCKER_CLIENTONLY from build scripts. Signed-off-by: Daniel Nephin <dnephin@docker.com> Change docker-daemon to dockerd. Signed-off-by: Daniel Nephin <dnephin@docker.com>
* *: purge dockerinit from source codeAleksa Sarai2016-01-261-10/+0
| | | | | | | | | | dockerinit has been around for a very long time. It was originally used as a way for us to do configuration for LXC containers once the container had started. LXC is no longer supported, and /.dockerinit has been dead code for quite a while. This removes all code and references in code to dockerinit. Signed-off-by: Aleksa Sarai <asarai@suse.com>
* Make "DEST" a make.sh construct instead of ad-hocTianon Gravi2015-05-301-2/+0
| | | | | | Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities). Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* hack/make/test-integration-cli: introduce MAKEDIR variableJörg Thalheim2015-04-151-2/+2
| | | | | | | - every execution of dirname costs time - less repeating Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
* .: remove trailing white spacesVincent Batts2015-03-251-1/+1
| | | | | | | | | | | | | | blame tibor this one ;-) ``` find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md' -not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path './.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not -path '*/testfiles/*' -not -path './bundles/*' -not -path './docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl '[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//' ``` Signed-off-by: Vincent Batts <vbatts@redhat.com>
* Revert "Dealing with trailing whitespaces"Tibor Vass2015-03-251-1/+1
| | | | | | | | | | | | | | | | The validation script from #10681 is too pedantic, and does not handle well situations like: ``` cat <<EOF # or <<-EOF Whether the leading whitespace is stripped out or not by bash it should still be considered as valid. EOF ``` This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482. Signed-off-by: Tibor Vass <tibor@docker.com>
* Dealing with trailing whitespacesAndré Martins2015-03-171-1/+1
| | | | | | | | | | | Created a validation that detects all trailing whitespaces from every text file that isn't *.go, *.md, vendor/*, docs/theme/mkdocs/tipuesearch* Removed trailing whitespaces from every text file except from vendor/* builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md Signed-off-by: André Martins <martins@noironetworks.com>
* Move scripts back to hack/, leave docs in project/Tianon Gravi2015-03-131-0/+22
| | | | | | This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* Move 'hack' to the less confusing 'project'Solomon Hykes2014-11-091-45/+0
| | | | | | | We might want to break it up into smaller pieces (eg. tools in one place, documents in another) but let's worry about that later. Signed-off-by: Solomon Hykes <solomon@docker.com>
* Revert "Use code generation to set IAMSTATIC instead of -X"Jessica Frazelle2014-10-281-19/+1
| | | | | | | | | | | This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc. Conflicts: .gitignore hack/make.sh hack/make/dynbinary Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
* finally, use code generation for INITSHA1 & INITPATH tooMichael Hudson-Doyle2014-10-241-1/+10
| | | | Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
* Use code generation to set IAMSTATIC instead of -XMichael Hudson-Doyle2014-10-241-0/+9
| | | | Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
* Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG ↵Tianon Gravi2014-07-301-1/+1
| | | | | | environment variable to simplify references to our "package path" in our bundlescripts) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* update go import path and libcontainerVictor Vieux2014-07-241-1/+1
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
* Disable netgo for dynbinary buildsTianon Gravi2014-06-191-0/+1
| | | | | | It's not necessary to use the netgo implementation for non-static builds. :) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Update bundlescripts to use "set -e" consistentlyTianon Gravi2014-04-091-0/+1
| | | | | | "set -e" is already inherited here from make.sh, but explicit is always better than implicit (hence the "set -e" in the first place!) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on ↵Tianon Gravi2014-03-191-2/+4
| | | | | | more things (specifically, the tgz files too) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the ↵Tianon Gravi2014-03-061-24/+29
| | | | | | dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Fix dynbinary so that dockerinit can still be properly static even if it has ↵Tianon Gravi2014-03-061-2/+10
| | | | | | to link against libapparmor for Ubuntu Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Update build tags such that we can properly compile on all platforms ↵Tianon Gravi2014-03-061-1/+1
| | | | | | (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Add shasum fallback to hack/make/dynbinary for Darwin (where sha1sum is not ↵Tianon Gravi2014-02-131-1/+12
| | | | | | available) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Move even more stuff into dockerversionTianon Gravi2014-02-111-1/+1
| | | | | | Also, use it in all the places. :) Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Merge pull request #3064 from tianon/custom-dockerinit-pathGuillaume J. Charmes2013-12-191-1/+1
|\ | | | | Allow custom dockerinit path
| * Allow packagers to specify a custom dockerinit lookup location via ↵Tianon Gravi2013-12-161-1/+1
| | | | | | | | | | | | DOCKER_INITPATH in dynbinary Only necessary if distro policy dictates that the path deviate from the paths already listed in utils/utils.go - please refrain from using it otherwise.
* | Add -a to our BUILDFLAGS directly, which fixes some fun test compilation issuesTianon Gravi2013-12-181-1/+1
|/ | | | Also, now that we use "-a", we no longer get any benefit from "go test -i", and it actually causes problems sometimes, so let's nuke it.
* Unify dyntest/test and dynbinary/binary hack bundlescripts further by ↵Tianon Gravi2013-12-081-2/+4
| | | | cross-invocation and keeping all the logic in one place, taking advantage of LDFLAGS_STATIC that is the only bit that gets replaced for dyntest/dynbinary
* Update bundlescript shebangs to be bash, reflecting how they're actually invokedTianon Gravi2013-12-021-1/+1
|
* Add dynbinary and dyntest scripts for building/testing a separate static ↵Tianon Gravi2013-10-251-0/+15
dockerinit binary After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.