beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23250 commits 14 branches 412 tags 338 MiB
Commit graph

150 commits

Author SHA1 Message Date
Jessica Frazelle
6c492a2d05 Update docs/base in makefile docs-build. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-16 17:53:54 -07:00
Jessica Frazelle
4602241f11 Fix clear cache docs release. 
Clear the cache for all files. Don't worry about what changed.

Move the docs release script back to the docker/docker repo, so we all can
easily watch the changes.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-03-11 10:11:13 -07:00
Sven Dowideit
8d4459fffb Don't require Docker 1.5.0 for docker build -f docs/Dockerfile 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Sven Dowideit
3e84b9e56a Import docs from swarm, machine and compose repositories, 
Also add the image spec from the code area to show we're building from the repo-root now

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-26 11:41:39 +10:00
Tianon Gravi
d7ec4360c1 Fix "upstream remote" dependence in Makefile 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-16 18:11:31 -07:00
Tianon Gravi
987050a52b Rename BINDDIR to BIND_DIR 
It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo.  This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-13 15:50:42 -07:00
Jessica Frazelle
d245a8a706 Validate toml 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
 2015-01-30 15:22:11 -08:00
Jessica Frazelle
a6a748b9a0 Update docs release script so we can have autodeploys 
to docs.master.dockerproject.com.

- Make the invaidation profile the bucket variable, not hard coded.
- Add no cache variable for settings cache to "no-cache"

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-01-12 09:56:43 -08:00
Sven Dowideit
cfaffd1ad2 Add docs Cloudfront cache invalidation 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-30 12:58:56 +10:00
Alexander Morozov
0874f9ab77 Merge pull request #9741 from tianon/test-docker-py 
Add docker-py integration tests aginst the docker daemon
 2014-12-19 11:57:35 -08:00
Tianon Gravi
100267de81 Tweak test-docker-py feature 
- move docker/docker-py clone to the Dockerfile
- put "integration test daemon startup" code in a separate file for both scripts to source
- add new test-docker-py Makefile target
- include "python-websocket" package in Dockerfile for running the tests

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2014-12-19 10:47:01 -07:00
Michael Crosby
5d6eca6642 Add docker-py integration tests aginst the docker daemon 
This clones and run the integration tests for docker-py master as part
of the integration tests created on master.  docker-py hits the api
directly and should be a good way to identify regressions in the api.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-12-17 13:48:45 -08:00
Sven Dowideit
fbb9223b1a add Scott's link checker script, and fix what it finds 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-12-16 14:46:25 +10:00
Tianon Gravi
82f33d86a7 Add some minor reorganization to the Makefile preamble 
The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
 2014-11-21 15:49:09 -07:00
Doug Davis
912b0f0f73 Allow a few more DOCKER_* env vars to pass thru Makefile 
I was trying to just build the Docker client but DOCKER_CLIENTONLY wasn't
getting passed thru from the shell to the container building docker.

So, this PR passes this var (via the -e option) on the docker run command
so we pick it up from the devs shell when running "make ...".

While in there I pulled all of the "-e" options into a new Makefile variable
so its easy to see just the list of env vars we pass along.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-11-13 11:25:11 -08:00
Sven Dowideit
4bae6235c0 Add --dryrun to allow testing to the docs-release site, and then fix the double dollar mistake 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-10-24 11:36:07 +10:00
Erik Hollensbe
aa129b356f hack: TIMEOUT (for controlling test timeout) and forwarding of 
BUILDFLAGS to binary/dynbinary.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-25 14:25:43 -07:00
Victor Vieux
b3ee9ac74e update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-24 22:19:50 +00:00
SvenDowideit
4d109f6158 avoid publishing to the root unless specified, so old version releases only goto their own dir 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-22 19:05:18 +10:00
Tianon Gravi
c2653b0a9e Update Makefile to default BINDDIR to nothing if DOCKER_HOST is set 
If "DOCKER_HOST" is set, we can usually assume the user is connecting to a remote Docker and thus not bind mount anything by default (meaning the Makefile will more often DWIM for our users).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-07 10:54:03 -06:00
Sven Dowideit
5f6a725332 add Docker version and branch to html header 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-06-25 16:23:33 -07:00
Tianon Gravi
8ec01f9dc1 Add "cross" to the "test" Makefile target 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-15 16:21:17 -06:00
Victor Marmol
a39f3c9200 Add new test-unit make rule which only runs the unit tests. Renames test 
bundle to test-unit.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
 2014-04-29 23:26:27 +00:00
Victor Marmol
6e05c420c9 Add a TESTDIRS variable to the test bundle to allow for the running of a 
single go directory worth of tests.

Docker-DCO-1.1-Signed-off-by: Victor Marmol <vmarmol@google.com> (github: vmarmol)
 2014-04-29 20:55:04 +00:00
Sven Dowideit
dc982d3053 make the non-release doc warning conditional and add version info 
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.

requires / extends PR #5272

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-04-23 21:07:12 +10:00
Sven Dowideit
e0af429a2a don't try allocating a port to upload a docs release to s3 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-04-23 11:59:16 +10:00
Tianon Gravi
7de1557b2e Add "validate" Makefile target 
This was supposed to be part of my previous PR, but somehow got missed.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-04-16 18:56:02 -06:00
Sven Dowideit
936a03bfdd move the documentation to markdown 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: )
 2014-04-16 00:02:10 +00:00
unclejack
62b08f557d cli integration: allow driver selection via vars 
This makes it possible to choose the graphdriver and the execdriver
which is going to be used for the cli integration tests.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-04-04 19:03:07 +03:00
Tianon Gravi
b51fe17833 Update Makefile with several improvements 
Especially but not limited to:
- make BINDDIR= ... - for when you don't want a bind mount at all
- make DOCSPORT=9000 docs - for when you want a not-8000 docs port
- when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest")

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-04-01 22:43:38 -06:00
Tianon Gravi
527bb5e960 Merge pull request #4904 from creack/make_dev 
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
 2014-04-01 10:19:56 -06:00
Guillaume J. Charmes
bd24eb07b6
Add $BINDIR to allow mounting the whole sources if needed (for development) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-04-01 09:01:27 -07:00
unclejack
6db32fdefd initial version of cli integration tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-29 23:09:40 +02:00
Victor Vieux
b9cb95c0a0 remove warnings from makefile 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-03 23:32:25 +00:00
Brian Goff
0b4aeb79d9 make docker build -rm=true default #4292 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-26 11:04:06 -05:00
Travis Cline
5006509131 Quote volume path to allow spaces 
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
 2014-02-17 10:24:50 -08:00
Victor Vieux
4326e541f8 add make test-integration 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-30 23:50:23 +00:00
Tianon Gravi
eaa9c85511 Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-14 19:23:30 -07:00
Tianon Gravi
a95712899e Update Makefile to use "docker:GIT_BRANCH" as the generated image name for increased versatility 
... and other minor Makefile improvements :)

Docker-DCO-1.0-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-01-07 18:38:07 -07:00
Tianon Gravi
4100e9b7df Update cross and tgz to play nicely together (creating a tgz for each supported OS/ARCH), and update release.sh to upload binaries and tgz files for all the supported OS/ARCH combos 2013-12-23 23:55:06 -07:00
Tianon Gravi
62a81370ff Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X) 2013-12-19 11:33:49 -07:00
Tianon Gravi
23ab0af2ff Merge pull request #3132 from tianon/hack-separate-integration 
Separate Integration Tests
 2013-12-13 10:55:49 -08:00
Sven Dowideit
27646c4459 make docs is more consistent 2013-12-11 10:14:56 +10:00
Tianon Gravi
f0879a1e14 Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript) 2013-12-08 18:43:24 -07:00
Tianon Gravi
00030ced4b Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean) 2013-12-04 16:56:01 -07:00
Paul Nasrat
d21563ced3 Support TESTFLAGS 2013-12-03 14:49:10 -05:00
Frederick F. Kautz IV
56ab9cb0d5 Minor fixes based on discussions on #2693 
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
 2013-11-30 00:09:41 -08:00
Frederick F. Kautz IV
7267c4b746 Removing sudo 2013-11-14 05:53:53 +00:00
Frederick F. Kautz IV
26533eb2c4 Adding a makefile 2013-11-14 05:34:25 +00:00
Solomon Hykes
89ee524229 Good-bye, ugly mega-Makefile. Docker can now be built with docker, with the help of a simple very simple shell script. 2013-08-20 19:34:10 -07:00
Victor Vieux
e66e0289ab update http://get.docker.io/latest 2013-07-30 17:18:19 +00:00
Daniel Mizyrycki
c21c5afe00 Merge pull request #1147 from dotcloud/1104-testing-static 
testing, issue #1104: Make the test use static flags
 2013-07-23 17:07:36 -07:00
Daniel Mizyrycki
bf26ae03cf Packaging, issue #1174: Add pure binary to docker release 2013-07-10 17:39:00 -07:00
Daniel Mizyrycki
4388bef996 testing, issue #1104: Make the test use static flags 2013-07-05 16:49:55 -07:00
Daniel Mizyrycki
cc63c1b584 Testing|hack, issue #1009: Update make kack environment 2013-06-24 15:01:51 -07:00
Victor Vieux
5ccde4dffc Merge pull request #801 from dotcloud/build_docker_static 
* Makefile: Add link flags in order to link statically and without debug symbols
 2013-06-21 02:30:57 -07:00
Solomon Hykes
db60337598 Makefile: added missing -a option 2013-06-20 10:39:09 -07:00
Guillaume J. Charmes
c5be64fec4 Add link flags in order to link statically and without debug symbols 2013-06-20 10:33:54 -07:00
Victor Vieux
2d6a49215c add testall rule 2013-06-19 18:21:53 +00:00
Victor Vieux
5dcab2d361 gofmt and test sub directories in makefile 2013-06-19 14:50:58 +00:00
Marcus Farkas
b25bcf1a66 fix docker version git output 2013-06-17 23:32:48 +00:00
Daniel Mizyrycki
3384943cd3 Packaging, dockerbuilder: Automate pushing docker binary packages 2013-06-13 22:14:43 -07:00
Tianon Gravi
c4ad6b077d Swap "go get" for "go get -d", especially to compile on go1.1rc; fixes #561 2013-05-08 14:51:50 -06:00
Solomon Hykes
a7c0e9a355 Fix a bug in the Makefile which caused dependency download to fail 2013-05-03 12:58:44 -07:00
Solomon Hykes
b6a5e604ab Add s3 upload to 'make release' 2013-05-02 11:32:55 -07:00
Solomon Hykes
6e486b638b + Hack: 'make s3release' uploads a clean build to s3 2013-05-02 11:25:49 -07:00
Daniel Mizyrycki
bb61678b57 development; issue #374: Refactor 'make hack' making Vagrantfile and VM more useful 2013-05-01 15:26:27 -07:00
Solomon Hykes
b3ab0b561e Makefile improvements 
+ Convenience rules: srcrelease, deps
	- Separate dependency vendoring from building the binary
	  (re-download dependencies with 'make deps')
 2013-04-23 19:41:38 -07:00
Solomon Hykes
8b8c8bf7cb Fix 'make release RELEASE_VERSION=master' 2013-04-23 18:50:53 -07:00
Solomon Hykes
a8651a23b2 make release: build a binary release of the most recent version tag 2013-04-23 18:32:59 -07:00
Solomon Hykes
76b40ad6c9 Merge remote-tracking branch 'origin/check_kernel_capabilities' 2013-04-20 17:40:25 -07:00
Solomon Hykes
e81ddb2dc7 Fixed 'hack' rule in Makefile 2013-04-19 12:55:17 -07:00
Solomon Hykes
4d728821e3 Merge remote-tracking branch 'origin/buildbot' 2013-04-19 12:47:22 -07:00
Guillaume J. Charmes
f68d107a13 Remove the NO_MEMORY_LIMIT constant 2013-04-18 21:08:20 -07:00
Guillaume J. Charmes
1967c8342a Allow to disable memory limit at compilation time 2013-04-12 10:48:20 -07:00
Julien Barbier
b7cda3288e Fix the Makefile, rule=hack to make it work on Windows 2013-04-09 19:07:50 -07:00
Daniel Mizyrycki
bbaa975ec8 testing: Add buildbot VM 2013-04-09 14:37:37 -07:00
Solomon Hykes
35c68944c7 Merged shawnsi/git-version 2013-04-02 20:26:22 -07:00
Shawn Siefkas
5471f5b2ee Implementing dirty git checkout indicator 2013-04-02 09:58:19 -05:00
Francisco Souza
650dff73bd makefile: simplify "fmt" target, and include -s flag 2013-04-01 18:50:25 -03:00
Shawn Siefkas
e566b89a5f Shortening the git commit used in the version command 2013-04-01 16:31:33 -05:00
Caleb Spare
9b13d21fc9 Add a 'fmt' target to the Makefile. 
A convenience for gofmting all the code, including subpackages.
 2013-04-01 13:05:00 -07:00
Shawn Siefkas
37a78902db Adding git commit to the version output 
The Makefile must be used in order to inject the git commit
via -ldflags.
 2013-04-01 13:52:45 -05:00
Mikhail Sobolev
f961ec55e7 print the location of the built binary 2013-03-26 17:19:58 +02:00
Mikhail Sobolev
21f55419b7 allow for verbose output from go tools 2013-03-26 17:19:58 +02:00
Mikhail Sobolev
5a0010abe9 do not print executed commands 2013-03-26 17:19:58 +02:00
Mikhail Sobolev
a57b37ed0e use .gopath/ instead of build/ 2013-03-26 17:19:57 +02:00
Mikhail Sobolev
6b4bc971fd add a test target 2013-03-26 17:19:57 +02:00
Mikhail Sobolev
7009d6c6dd introduce top-level Makefile to build the docker binary 2013-03-26 17:19:54 +02:00
creack
08cb430281 Move the debian makefile to avoid confusions 2013-03-22 04:34:46 -07:00
Frederick F. Kautz IV
6316b99556 Adding clean to beginning of all for cleaner builds. 2013-03-17 11:59:59 -07:00
Frederick F. Kautz IV
bb9ce6b287 Adding bin to clean 2013-03-17 11:54:05 -07:00
Frederick F. Kautz IV
a3ca3e9218 Makefile cleanup renamed to clean to match standard conventions. 2013-03-17 11:53:37 -07:00
Daniel Mizyrycki
0e0d76b7ac packaging; issue #30: Add tests to Makefile 2013-03-14 23:13:31 -07:00
creack
eab39dc3fa Add local build and tests to makefile 2013-03-14 23:13:31 -07:00
Daniel Mizyrycki
47a5a51d39 packaging; issue #30: Adjust package metadata 2013-03-14 23:13:31 -07:00
Solomon Hykes
9598b28933 Moved debian-specific files to ./deb, minor fixes to Makefile 2013-03-14 23:13:31 -07:00
Solomon Hykes
d615496c4c Gradual improvement of Makefile 2013-03-14 23:13:31 -07:00
Daniel Mizyrycki
3b9c97a5d5 packaging; issue #30: Add ubuntu deb packaging 2013-03-14 23:13:31 -07:00
Jeremy Grosser
c017c7baa4 Add makefile 2013-03-13 00:30:20 +00:00