e907df8d93
Merge pull request #7474 from crosbymichael/testing-import
...
Only import "testing" in test packages
2014-08-07 14:48:00 -07:00
b386bce1f1
Graphtest is ok to compile normally
...
The graphtest package is only imported in the test files of other
packages therefore we do not leak testing flags.
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-07 14:33:09 -07:00
b87daf6d69
Only import "testing" from *_test.go
...
This prevents the testing package flags from leaking into the flagsets
of binaries that import docker. I left integration-cli alone.
Docker-DCO-1.1-Signed-off-by: Peter Bourgon <peter@bourgon.org> (github: peterbourgon)
2014-08-07 14:25:21 -07:00
ab3e34e187
Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate
...
Replace amd64 build tags with cgo as appropriate
2014-08-07 16:24:19 -04:00
45a239c168
Merge pull request #7413 from cpuguy83/7319_use_blackfriday_not_pandoc_for_manfile_gen
...
Use pure go markdown processor to generate man files
2014-08-07 14:23:49 -06:00
140e6abb17
Merge pull request #7443 from ewindisch/name-id-lookup-reversal
...
Container name lookups to prefer IDs over names
2014-08-07 11:14:47 -07:00
abbfc7e828
Merge pull request #7423 from tianon/nuclear-_-weapons--we-got-the-bomb
...
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
2014-08-07 12:11:50 -06:00
dc296903f0
Merge pull request #7446 from cpuguy83/cleanup_extract_bindmount_spec_parsing
...
Cleanup: extract bindmount spec parsing
2014-08-07 11:48:07 -04:00
3f136dc0e0
Use pure go markdown processor to generate man files
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-07 07:06:39 -04:00
7e12911f62
Merge pull request #7452 from shykes/7370-on-7427
...
Cleanup: move image management and logging out of deprecated Server
2014-08-06 18:47:45 -07:00
89ec17d113
Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 17:20:21 -06:00
bc684fae64
Merge pull request #7430 from tamsky/docfixes
...
style, grammar, spelling fixes.
2014-08-06 16:11:52 -07:00
e86d87e1ce
Merge pull request #7431 from tamsky/fixes-7105
...
add warning re: changing value of `dm.basesize`.
2014-08-06 15:22:42 -07:00
8733cd7c0b
Merge pull request #7428 from crosbymichael/update-libcontainer-aug2
...
Update libcontainer to 5589d4d879f1d7e31967a927d3e
2014-08-06 15:41:35 -06:00
f34679d0a9
Cleanup: extract bindmount spec parsing
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-08-06 17:22:40 -04:00
c9ca37dfe9
Merge pull request #7448 from tiborvass/fix-tmpdir-integration-tests
...
Fix tmpdir integration tests
2014-08-06 23:54:09 +03:00
90da088491
Merge pull request #27 from tianon/update-libcontainer
...
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
2014-08-06 13:35:46 -07:00
872db07119
Fix integration tests by adding DOCKER_TMPDIR env in the test init function
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 15:55:50 -04:00
fba37a038d
Update vendor with the updated canonical deps from libcontainer
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:19:41 -06:00
5101173e1f
Update hack/vendor.sh to use libcontainer's update-vendor.sh script as the source of truth for libcontainer deps and not include them in Docker's repo twice
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-06 13:18:24 -06:00
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 14:24:00 -04:00
66c8f87e89
Merge pull request #6456 from rhatdan/tmpdir
...
Docker should use /var/lib/docker/tmp for large temporary files.
2014-08-06 20:31:46 +03:00
231e07ded4
Container name lookups to prefer IDs over names
...
Lookups of container names should prefer the ID over
names assigned to containers by users.
Signed-off-by: Eric Windisch <eric@windisch.us>
2014-08-06 13:09:11 -04:00
1c11d7f93e
Rename "log_event" to "log"
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:23 +00:00
8d056423f8
Separate events subsystem
...
* Events subsystem merged from `server/events.go` and
`utils/jsonmessagepublisher.go` and moved to `events/events.go`
* Only public interface for this subsystem is engine jobs
* There is two new engine jobs - `log_event` and `subscribers_count`
* There is auxiliary function `container.LogEvent` for logging events for
containers
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
[solomon@docker.com: resolve merge conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 10:08:19 +00:00
af0781974d
Check error returned by eng.Register() in TagStore.Install()
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 17:19:01 -04:00
69f9d488dc
Move some integration tests to integration-cli
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 17:18:51 -04:00
d787937957
Move "image_tag" and "tag" to graph/tag.go
...
Note: these 2 jobs should be merged into one. This was noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:51 -04:00
7a5e3df162
Move "image_delete" to daemon/image_delete.go
...
Note: this cannot yet be moved to graph/ because of a lingering
dependency on daemon. This has been noted in a FIXME.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
fa27580cff
Move "import" to graph/import.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
f2029f7be1
Move "load" to graph/load.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
77781440f1
Move "viz" to graph/viz.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
51dd68d659
Move "images" to graph/list.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
55235e121e
Move "image_history" to graph/history.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
6e28d11d1f
Move "image_export" to graph/export.go
...
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-08-06 17:18:50 -04:00
bd30746e07
add warning re: changing value of `dm.basesize`.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 19:28:07 -07:00
6215422286
Update libcontainer to 5589d4d879f1d7e31967a927d3e
...
Signed-off-by: Michael Crosby <michael@docker.com>
2014-08-05 18:13:43 -07:00
07099b6256
style, grammar, spelling fixes.
...
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
2014-08-05 18:11:32 -07:00
042b642d40
Merge pull request #7186 from jamtur01/community
...
Added proposed Docker Community Guidelines
2014-08-05 15:44:11 -07:00
0ea5160d2a
Merge pull request #7412 from bfirsh/rename-docker-config
...
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
2014-08-05 14:52:28 -07:00
b4813f2841
Docker should use /var/lib/container/tmp for large temporary files.
...
/tmp is often a tmpfs file system and large temporary files could cause
docker commands to fail. Also using /tmp potentially allows users on the
system to get access to content, or even attack the content. Moving the tmpdir to
/var/lib/container/tmp will protect the data.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Conflicts:
docker/docker.go
2014-08-05 16:43:42 -04:00
8f4b477c32
Merge pull request #6909 from LK4D4/prune_cmd_on_entrypoint_setting_#5147
...
Cleanup cmd on entrypoint setting
2014-08-05 11:50:18 -07:00
047ce47d92
Add contrib/nuke-graph-directory.sh script to clean out old /var/lib/docker directories much more easily
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-08-05 12:36:39 -06:00
e47415d5f5
Merge pull request #7349 from knan-linpro/master
...
networking.md: Networking between containers works without ip_forward
2014-08-04 23:51:22 -04:00
a49de2c467
Rename DOCKER_CONFIG envvar to DOCKER_CERT_PATH
...
DOCKER_CONFIG was introduced in #6984 .
We may use "config" for other purposes (e.g. #7232 ). Until we
have made a design decision around how configuration files will
work, DOCKER_CERT_PATH is a much safer name to rely on for future
compatibility.
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
2014-08-04 17:36:53 -07:00
3c1212ca30
Merge pull request #7377 from tianon/daemon-build-tag
...
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
2014-08-04 17:32:03 -07:00
6b94f2d9be
Merge pull request #7310 from stevecrozz/maintainers-grammar-update
...
Correct grammar in MAINTAINERS.md
2014-08-04 17:57:08 -06:00
ba663eac3a
Adjust build tags to be client-only in "make cross" too
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
1b95590d06
Add a "daemon" build tag and toggle it with the already-existing "DOCKER_CLIENTONLY" build variable
...
This works mostly by refactoring our "main" package to be careful about what it imports based on the daemon build tag. :)
Also, I've updated Travis to test "client-only" compilation after it tests the daemon version.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-08-04 15:05:12 -06:00
74212a1565
Correct grammer in MAINTAINERS.md
...
Signed-off-by: Stephen Crosby <stevecrozz@gmail.com>
2014-08-04 13:37:01 -07:00
Michael Crosby
Peter Bourgon
Tibor Vass
Tianon Gravi
Brian Goff
Solomon Hykes
unclejack
Eric Windisch
Alexandr Morozov
Marc Tamsky
Dan Walsh
James Turnbull
Ben Firshman
Stephen Crosby