9bc502ecde
move leeroy under docker
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-22 12:57:13 -07:00
c328e0c827
Merge pull request #14628 from estesp/update-docker-py
...
Update docker-py commit to current master (~1.3.1 release)
2015-07-22 12:41:41 -07:00
1c6fe58efc
Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
...
Refactor log driver reader
2015-07-22 11:54:35 -07:00
19ba7f9e23
Merge pull request #14753 from flavio/zfs-initialization-errors
...
ZFS driver: raise better errors during init
2015-07-22 14:27:46 -04:00
40b922418c
Merge pull request #14699 from estesp/docker-ps-format
...
Carry #10255 : Docker ps format
2015-07-22 10:58:34 -07:00
65fb04228e
Update docker-py to current master (~docker-py 1.3.1)
...
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.
Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-07-22 13:17:59 -04:00
fe68ac806b
Merge pull request #14858 from icecrime/14756_update_linted_packages
...
Update linted package list
2015-07-22 10:11:51 -07:00
542b58d8f7
ps --format: Add config.js doc, fix gofmt, add integration tests
...
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-07-22 12:51:16 -04:00
7d8859a4f5
Merge pull request #14217 from ankushagarwal/ubuntu-15.04
...
Add support for 15.04, add systemd note for 15.04
2015-07-22 08:56:02 -07:00
b7184f8574
Update linted package list
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-22 08:46:42 -07:00
875fffdff8
Merge pull request #14851 from bfirsh/golint-integration-cli
...
Golint integration-cli
2015-07-22 11:28:19 -04:00
a751c0a52f
Merge pull request #14790 from hqhq/hq_golint_build
...
Fix golint warnings for builder
2015-07-22 08:17:04 -07:00
f0d0a52d80
Merge pull request #14817 from runcom/golint-pkg-mount
...
pkg: mount: golint
2015-07-22 09:23:26 -04:00
a10cb08bbb
Merge pull request #14802 from rhatdan/error
...
If a user hits this error it would be helpful to know tagstore name.
2015-07-22 06:17:38 -07:00
5328cc346f
Merge pull request #14850 from runcom/14846-fix-get-images-search-content-type
...
Fix wrong Content-Type returned by /images/search API
2015-07-22 06:16:16 -07:00
6b3c928140
Fix golint warnings for integration-cli
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-07-22 14:03:50 +01:00
4815fdc334
Merge branch 'master' of github.com:docker/docker into error
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-07-22 08:06:19 -04:00
1a5d6a94c9
Fix wrong Content-Type returned by /images/search API
...
/images/search was replying with Content-Type text/plain instead
of application/json.
Fix #14846
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-22 11:07:41 +02:00
0f5c9d301b
pkg: mount: golint
...
Fix the following warnings:
pkg/mount/mountinfo.go:5:6: type name will be used as mount.MountInfo by other packages, and that stutters; consider calling this Info
pkg/mount/mountinfo.go:7:2: struct field Id should be ID
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-22 10:26:10 +02:00
757c4f0d5c
Merge pull request #14821 from stevvooe/coding-style-guidelines
...
Adding Go coding style guidelines
2015-07-22 09:08:43 +02:00
50d2597e49
Merge pull request #13711 from calavera/version_volumes_inspect
...
Expose new mount points structs in inspect.
2015-07-22 09:02:00 +02:00
8c4a282a57
Fix golint warnings for builder
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-22 13:29:03 +08:00
30b951ff08
Merge pull request #14842 from hqhq/hq_remove_rootuid
...
Remove unused parameter in NewTtyConsole
2015-07-21 21:37:21 -07:00
ff011ededb
Merge pull request #14804 from dave-tucker/golint_nat
...
golint: Fix issues in pkg/nat
2015-07-21 20:38:40 -07:00
06162fed8b
Merge pull request #14822 from runcom/host-config-links-on-start
...
Allow starting a container with an existing hostConfig which contains links
2015-07-21 20:06:26 -07:00
052b23e290
Merge pull request #14770 from albers/completion-log-opt
...
Bash completion for log drivers and their options
2015-07-21 19:58:12 -07:00
b6c5f6d075
Merge pull request #14794 from HuKeping/ci
...
CI: use dockerCmd in integration-cli when possible
2015-07-21 19:57:33 -07:00
012b67c3ea
CI: use dockerCmd in integration-cli when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-22 17:55:41 +08:00
162ae444af
Merge pull request #14677 from vincentbernat/fix/zsh-completion-update-4
...
zsh: update zsh completion for docker command
2015-07-21 19:56:03 -07:00
5dda570d50
Merge pull request #14688 from Microsoft/10662-hookupmac
...
Windows: Hook up user supplied MAC
2015-07-21 19:55:21 -07:00
7a06e85270
Merge pull request #14812 from LK4D4/fix_cgroup_parent_tests
...
Fix cgroup parent tests
2015-07-21 19:53:48 -07:00
dda1d66ac7
Merge pull request #14808 from cpuguy83/bump_md2man
...
Bump go-md2man to 1.0.3
2015-07-21 19:53:26 -07:00
af3059855c
Remove unused parameter in NewTtyConsole
...
It's introduced in
68ba5f0b69
2015-07-22 10:32:31 +08:00
d3b3ebc3a4
remove dead code after decoupling from jsonlog
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-21 20:47:35 -04:00
c0391bf554
Split reader interface from logger interface
...
Implement new reader interface on jsonfile.
Moves jsonlog decoding from daemon to jsonfile logger.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-21 20:47:31 -04:00
c986f85f73
Merge pull request #13171 from jlhawn/archive_copy
...
docker cp to and from containers
2015-07-21 16:59:44 -07:00
15d01d6e6c
golint: Fix issues in pkg/nat
...
Updates #14756
Signed-off-by: Dave Tucker <dt@docker.com>
2015-07-22 00:47:41 +01:00
879f440a99
Merge pull request #14833 from icecrime/14756_update_lint_script
...
Update validate-lint script
2015-07-21 19:28:19 -04:00
42533e323c
Merge pull request #14829 from RichardScothern/registry-tls
...
Configure TLS for private v2 registry mirrors.
2015-07-21 19:23:39 -04:00
36106a20ca
Merge pull request #14682 from duglin/Issue14621
...
Remove panic in nat package on invalid hostport
2015-07-21 15:48:51 -07:00
d52b2b98ba
Merge pull request #14830 from Microsoft/10662-removebadcomment
...
Windows: Remove erroneous comment only (no code change)
2015-07-22 00:39:58 +02:00
1c3cb2d31e
Expose new mount points structs in inspect.
...
Keep old hashes around for old api version calls.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-21 15:33:05 -07:00
e54b1e081a
docs: Updated for docker cp and its API changes
...
Documented changes to API to enable new `docker cp` behavior.
Added documentation on `docker cp` usage and behavior.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 15:30:20 -07:00
6b36a488e7
Remove v1 registry mirror configuration from LookupEndpoints.
...
V1 mirrors do not mirror the index and those endpoints should
only be indexes.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-07-21 15:21:41 -07:00
cb57b25689
Configure TLS for private registry mirrors.
...
If a registry mirror is using TLS, ensure that certs for it
are picked up from /etc/docker/certs.d
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-07-21 15:21:25 -07:00
418135e7ea
integration-cli: New `docker cp` integration tests
...
Adds several integration tests for `docker cp` behavior with over a dozen
tests for each of:
container -> local
local -> container
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 15:19:52 -07:00
93c3e6c91e
api/client: New and Improved `docker cp` behavior
...
Supports copying things INTO a container from a local file or from a tar
archive read from stdin.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 15:19:52 -07:00
db9cc91a9e
api/server: StatPath, ArchivePath, ExtractToDir
...
Adds http handlers for new API endpoints:
GET ContainersArchivePath
Return a Tar Archive of the contents at the specified location in a
container. Deprecates POST ContainersCopy. Use a HEAD request to stat
the resource.
PUT ContainersExtractToDir
Extract the Tar Archive from the request body to the directory at the
specified location inside a container.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 15:19:52 -07:00
7f02cc420a
Update validate-lint script
...
Add a set of newly linted packages, and fix the script.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 15:02:46 -07:00
0d17cba922
Merge pull request #14820 from aaronlehmann/registry-dead-code
...
Remove dead code in registry package
2015-07-21 17:45:49 -04:00
Jessica Frazelle
Alexander Morozov
David Calavera
Brian Goff
Phil Estes
moxiegirl
Arnaud Porterie
Tibor Vass
Doug Davis
Ben Firshman
Dan Walsh
Antonio Murdaca
Sebastiaan van Stijn
Qiang Huang
Jessie Frazelle
Hu Keping
Dave Tucker
Antonio Murdaca
Josh Hawn
Richard Scothern