Doug Davis
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
Doug Davis
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
Dan Walsh
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
Antonio Murdaca
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
Sebastiaan van Stijn
757c4f0d5c
Merge pull request #14821 from stevvooe/coding-style-guidelines
...
Adding Go coding style guidelines
2015-07-22 09:08:43 +02:00
Sebastiaan van Stijn
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
Alexander Morozov
30b951ff08
Merge pull request #14842 from hqhq/hq_remove_rootuid
...
Remove unused parameter in NewTtyConsole
2015-07-21 21:37:21 -07:00
Jessie Frazelle
ff011ededb
Merge pull request #14804 from dave-tucker/golint_nat
...
golint: Fix issues in pkg/nat
2015-07-21 20:38:40 -07:00
Jessie Frazelle
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
Jessie Frazelle
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
Jessie Frazelle
b6c5f6d075
Merge pull request #14794 from HuKeping/ci
...
CI: use dockerCmd in integration-cli when possible
2015-07-21 19:57:33 -07:00
Hu Keping
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
Jessie Frazelle
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
Jessie Frazelle
5dda570d50
Merge pull request #14688 from Microsoft/10662-hookupmac
...
Windows: Hook up user supplied MAC
2015-07-21 19:55:21 -07:00
Jessie Frazelle
7a06e85270
Merge pull request #14812 from LK4D4/fix_cgroup_parent_tests
...
Fix cgroup parent tests
2015-07-21 19:53:48 -07:00
Jessie Frazelle
dda1d66ac7
Merge pull request #14808 from cpuguy83/bump_md2man
...
Bump go-md2man to 1.0.3
2015-07-21 19:53:26 -07:00
Qiang Huang
af3059855c
Remove unused parameter in NewTtyConsole
...
It's introduced in
68ba5f0b69
(Execdriver implementation on new libcontainer API)
But I don't see reson why we need it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-22 10:32:31 +08:00
Arnaud Porterie
c986f85f73
Merge pull request #13171 from jlhawn/archive_copy
...
docker cp to and from containers
2015-07-21 16:59:44 -07:00
Dave Tucker
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
Tibor Vass
879f440a99
Merge pull request #14833 from icecrime/14756_update_lint_script
...
Update validate-lint script
2015-07-21 19:28:19 -04:00
Tibor Vass
42533e323c
Merge pull request #14829 from RichardScothern/registry-tls
...
Configure TLS for private v2 registry mirrors.
2015-07-21 19:23:39 -04:00
David Calavera
36106a20ca
Merge pull request #14682 from duglin/Issue14621
...
Remove panic in nat package on invalid hostport
2015-07-21 15:48:51 -07:00
Antonio Murdaca
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
David Calavera
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
Josh Hawn
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
Richard Scothern
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
Richard Scothern
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
Josh Hawn
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
Josh Hawn
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
Josh Hawn
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
Arnaud Porterie
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
Tibor Vass
0d17cba922
Merge pull request #14820 from aaronlehmann/registry-dead-code
...
Remove dead code in registry package
2015-07-21 17:45:49 -04:00
John Howard
bd30d27636
Windows: Remove erroneous comment
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-21 14:25:08 -07:00
Stephen J Day
d57ea8da25
Adding Go coding style guidelines
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-07-21 13:47:02 -07:00
Arnaud Porterie
c88ce893a5
Merge pull request #14805 from dave-tucker/golint_namesgen
...
golint: Lint pkg/namesgenerator
2015-07-21 13:45:31 -07:00
Antonio Murdaca
65121e5fce
Allow starting a container with an existing hostConfig which contains links
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-21 22:10:00 +02:00
Aaron Lehmann
9e76e184e4
Remove unused types in registry package
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-21 11:53:57 -07:00
Aaron Lehmann
962dc622d9
Remove dead code in registry package
...
The only uses of RequestAuthorization and its associated functions were
removed in 19515a7ad8
("Update graph to
use vendored distribution client for the v2 codepath")
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-21 11:45:53 -07:00
Josh Hawn
c32dde5baa
daemon: container ArchivePath and ExtractToDir
...
The following methods will deprecate the Copy method and introduce
two new, well-behaved methods for creating a tar archive of a resource
in a container and for extracting a tar archive into a directory in a
container.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 11:20:10 -07:00
Josh Hawn
a74799b701
pkg/archive: new utilities for copying resources
...
Adds TarResource and CopyTo functions to be used for creating
archives for use with the new `docker cp` behavior.
Adds multiple test cases for the CopyFrom and CopyTo
functions in the pkg/archive package.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-21 11:03:25 -07:00
David Calavera
3ee15acaad
Merge pull request #14659 from calavera/promote_volumes_experimental_to_master
...
Promote volume drivers from experimental to master.
2015-07-21 10:39:17 -07:00
Antonio Murdaca
d796bb9151
Merge pull request #14815 from LK4D4/remove_tty_terminal
...
Remove unused TtyTerminal interface
2015-07-21 19:36:43 +02:00
Arnaud Porterie
943bf44686
Merge pull request #13617 from Microsoft/10662-sql
...
Windows: Statically linkable SQLite3
2015-07-21 10:12:40 -07:00
Alexander Morozov
6ae377ffa0
Remove unused TtyTerminal interface
...
It was used only by integration tests, which now gone.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-21 09:56:28 -07:00
Alexander Morozov
e4f1cf787c
Merge pull request #14780 from icecrime/14756_add_golint
...
Add golint to the development toolbox
2015-07-21 09:50:58 -07:00
John Howard
10bcaca914
Windows: Statically linkable SQLite3
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-21 09:33:46 -07:00
David Calavera
c4d45b6a29
Promote volume drivers from experimental to master.
...
Remove volume stubs and use the experimental path as the only path.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-21 09:32:44 -07:00
Antonio Murdaca
06b922c63f
Merge pull request #14801 from HuKeping/golint
...
golint: use golint to check package util
2015-07-21 18:09:39 +02:00
Hu Keping
17ce34116a
golint: use golint to check package util
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-22 05:34:13 +08:00
Arnaud Porterie
6cce8d1838
Add golint to the development toolbox
...
Add golint to the Dockerfile, and a `validate-lint` task to the
Makefile. Currently, the linter will process a harcoded list of packages
that will expand as we fix more warnings. Eventually, the linter should
process all subpackages of the repo (excluding vendored code).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 09:00:36 -07:00