Commit Graph

104 Commits

Author SHA1 Message Date
abd71318ca Revert "Dealing with trailing whitespaces"
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>
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
d00e59a1a0 Merge pull request #10681 from noironetworks/whitespaces-cleaner
Removed all trailing whitespaces from every text file
Upstream-commit: 322095ed63ec0943378485f8f8d4cabcfd471875
Component: engine
2015-03-24 16:02:14 -07:00
a0dccb769e Merge pull request #11328 from jfrazelle/fix-docs-release-script
Fix clear cache docs release.
Upstream-commit: 42f5c874254798c2e2bc8060939e48ade5c97e23
Component: engine
2015-03-18 16:06:27 -07:00
a64392e089 Dealing with trailing whitespaces
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>
Upstream-commit: 4e65c1c319afffc325853b88c9aef0c42ec83482
Component: engine
2015-03-17 03:34:01 +00:00
2b2155313c Update docs/base in makefile docs-build.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6c492a2d05cc59d79d03c2015b8ed8140d44b343
Component: engine
2015-03-16 17:53:54 -07:00
853ddc3c31 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)
Upstream-commit: 4602241f11b626d40bf67cfe3a13d3c146adf335
Component: engine
2015-03-11 10:11:13 -07:00
17fe06fc30 Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d4459fffb5c1885b65506093538e059f0b51d90
Component: engine
2015-02-26 11:41:39 +10:00
824b119187 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>
Upstream-commit: 3e84b9e56abdff7230e84a1830085c79c73aa3b7
Component: engine
2015-02-26 11:41:39 +10:00
5d5a391206 Fix "upstream remote" dependence in Makefile
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d7ec4360c14421c146642f0a514e829207607f1a
Component: engine
2015-02-16 18:11:31 -07:00
ac657c8159 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>
Upstream-commit: 987050a52b0ce6d5ae77554a03af5923304bd3e5
Component: engine
2015-02-13 15:50:42 -07:00
255fb9b1d6 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)
Upstream-commit: d245a8a706558c4a66498cb8d1a1d8fe38dd67ee
Component: engine
2015-01-30 15:22:11 -08:00
8ffe7cacc7 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)
Upstream-commit: a6a748b9a0ce459fe1e250fdc5d107363315aeca
Component: engine
2015-01-12 09:56:43 -08:00
4d06ba471c 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>
Upstream-commit: cfaffd1ad26cf64330b87d0f99a883215b4c5a3e
Component: engine
2014-12-30 12:58:56 +10:00
a2d81fbbe1 Merge pull request #9741 from tianon/test-docker-py
Add docker-py integration tests aginst the docker daemon
Upstream-commit: 0874f9ab77a7957633cd835241a76ee4406196d8
Component: engine
2014-12-19 11:57:35 -08:00
241c2f0465 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>
Upstream-commit: 100267de81985bbf3b976bfde850def89487dc11
Component: engine
2014-12-19 10:47:01 -07:00
da3465e509 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>
Upstream-commit: 5d6eca6642c5749099513f1f66bb44e004aa0938
Component: engine
2014-12-17 13:48:45 -08:00
912c56d931 add Scott's link checker script, and fix what it finds
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
2014-12-16 14:46:25 +10:00
7eeacf5615 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>
Upstream-commit: 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Component: engine
2014-11-21 15:49:09 -07:00
6e188415a0 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>
Upstream-commit: 912b0f0f73346bf93c4feb32c84c62c18ee62dbc
Component: engine
2014-11-13 11:25:11 -08:00
ff5f13dc15 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)
Upstream-commit: 4bae6235c0aec3a0e3805b046a08fc7e6aadd46b
Component: engine
2014-10-24 11:36:07 +10:00
449c9e0d74 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)
Upstream-commit: aa129b356ff9f16409cba25e9f16805923970cad
Component: engine
2014-09-25 14:25:43 -07:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
5fa2981ff0 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)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
3c148b5823 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)
Upstream-commit: c2653b0a9ed4b371342fc2019c56d9433197171e
Component: engine
2014-07-07 10:54:03 -06:00
518e2ca12c add Docker version and branch to html header
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 5f6a7253321ffafdf84f53ea0253dd703b105c6b
Component: engine
2014-06-25 16:23:33 -07:00
3bd2cdddb8 Add "cross" to the "test" Makefile target
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 8ec01f9dc1d18c532f60f1bfb6c0ab5eea378b3c
Component: engine
2014-05-15 16:21:17 -06:00
79d31745eb 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)
Upstream-commit: a39f3c9200d574c12b88fb91654f1242ec07b7b5
Component: engine
2014-04-29 23:26:27 +00:00
f54d99728b 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)
Upstream-commit: 6e05c420c9b7e4660b391643be21720d6f80e18d
Component: engine
2014-04-29 20:55:04 +00:00
9a6a4062e0 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)
Upstream-commit: dc982d3053bf46e03ad27c29d4662a9d5ba5e819
Component: engine
2014-04-23 21:07:12 +10:00
746d0d0ba1 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)
Upstream-commit: e0af429a2acd7681f423ca29ff88b60d9bf2450f
Component: engine
2014-04-23 11:59:16 +10:00
ea4b2c62dc 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)
Upstream-commit: 7de1557b2e5bc1ed86e19ffe080889ac74beea42
Component: engine
2014-04-16 18:56:02 -06:00
0bb55ea3f4 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: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
2014-04-16 00:02:10 +00:00
3057a30784 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)
Upstream-commit: 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1
Component: engine
2014-04-04 19:03:07 +03:00
5daacf2dcb 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)
Upstream-commit: b51fe1783347c1bf679870925a271531a925b7e9
Component: engine
2014-04-01 22:43:38 -06:00
55841b2181 Merge pull request #4904 from creack/make_dev
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
Upstream-commit: 527bb5e9602fdcd78e4bad99d9a56300d830e6af
Component: engine
2014-04-01 10:19:56 -06:00
d65f1f9f12 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)
Upstream-commit: bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa
Component: engine
2014-04-01 09:01:27 -07:00
624997be0f initial version of cli integration tests
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
2014-03-29 23:09:40 +02:00
d1e812bd95 remove warnings from makefile
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: b9cb95c0a07e421c8cbf83fa79aaedead809c802
Component: engine
2014-03-03 23:32:25 +00:00
0eecb77d00 make docker build -rm=true default #4292
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
2014-02-26 11:04:06 -05:00
077c2ff0d6 Quote volume path to allow spaces
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 5006509131986093a9529a748e80e023e19548f3
Component: engine
2014-02-17 10:24:50 -08:00
b3054dc35d add make test-integration
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4326e541f843e5c053221f15fef546b42ba29e25
Component: engine
2014-01-30 23:50:23 +00:00
0f4b49bea8 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)
Upstream-commit: eaa9c85511620aa82f1876e1503604f591f00d23
Component: engine
2014-01-14 19:23:30 -07:00
cec8247ebd 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)
Upstream-commit: a95712899e33f267a3061fa94d05189e7c371eaa
Component: engine
2014-01-07 18:38:07 -07:00
7db2296200 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
Upstream-commit: 4100e9b7df5cbce855b47b3625d34c9667e40dc1
Component: engine
2013-12-23 23:55:06 -07:00
a7fc58e1eb Add new "cross" bundle to cross-compile the Docker client for other platforms (currently just 32-bit and 64-bit OS X)
Upstream-commit: 62a81370fffb3cfdb15ef19702f0ea07ab2f4c36
Component: engine
2013-12-19 11:33:49 -07:00
433f293713 Merge pull request #3132 from tianon/hack-separate-integration
Separate Integration Tests
Upstream-commit: 23ab0af2ff3083f475b67787cc5619ead5524948
Component: engine
2013-12-13 10:55:49 -08:00
0675a87be6 make docs is more consistent
Upstream-commit: 27646c445951b47a728675764d7ef2b198436156
Component: engine
2013-12-11 10:14:56 +10:00
bc39a675a4 Add separate "test-integration" bundlescript (and corresponding dyntest-integration bundlescript)
Upstream-commit: f0879a1e145f31569e9e4e61f429de858bb636ab
Component: engine
2013-12-08 18:43:24 -07:00
610b53a9fe Tweak Makefile for consistency and Ctrl+C-ability (also, -rm to keep it clean)
Upstream-commit: 00030ced4bf2d0242883fae0b4ece61149f1d437
Component: engine
2013-12-04 16:56:01 -07:00
05ddc4a077 Support TESTFLAGS
Upstream-commit: d21563ced3a24ebfc8a9b53e5ec687543f7b2979
Component: engine
2013-12-03 14:49:10 -05:00