Commit Graph
16921 Commits
Author SHA1 Message Date
Jessie Frazelle 9c4a1f92a0 Merge pull request #14804 from dave-tucker/golint_nat
golint: Fix issues in pkg/nat
Upstream-commit: ff011ededba4b51c047a9f8d27c7c5c327494c0d
Component: engine
2015-07-21 20:38:40 -07:00
Jessie Frazelle 8365f62c47 Merge pull request #14822 from runcom/host-config-links-on-start
Allow starting a container with an existing hostConfig which contains links
Upstream-commit: 06162fed8b12d4f43ca3d03d6956996b6c73015d
Component: engine
2015-07-21 20:06:26 -07:00
Jessie Frazelle 417958d0e1 Merge pull request #14770 from albers/completion-log-opt
Bash completion for log drivers and their options
Upstream-commit: 052b23e2901131393737829b03a7e8a37e9232f6
Component: engine
2015-07-21 19:58:12 -07:00
Jessie Frazelle 375f0f6c45 Merge pull request #14794 from HuKeping/ci
CI: use dockerCmd in integration-cli when possible
Upstream-commit: b6c5f6d0754f2fd57fbc98aec569a86f59e17545
Component: engine
2015-07-21 19:57:33 -07:00
Hu Keping 018c7593fb CI: use dockerCmd in integration-cli when possible
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 012b67c3ea5bff539673deaa7058036126ac1046
Component: engine
2015-07-22 17:55:41 +08:00
Jessie Frazelle 797e2bf06e Merge pull request #14677 from vincentbernat/fix/zsh-completion-update-4
zsh: update zsh completion for docker command
Upstream-commit: 162ae444afd9a82af4c3448654bef03fedb11d04
Component: engine
2015-07-21 19:56:03 -07:00
Jessie Frazelle 814cff41a7 Merge pull request #14688 from Microsoft/10662-hookupmac
Windows: Hook up user supplied MAC
Upstream-commit: 5dda570d508475d59a42633ee67efa22f87fe52b
Component: engine
2015-07-21 19:55:21 -07:00
Jessie Frazelle dfe8a9060f Merge pull request #14812 from LK4D4/fix_cgroup_parent_tests
Fix cgroup parent tests
Upstream-commit: 7a06e8527087cf9d21b4261b3ebe6575aba68ce1
Component: engine
2015-07-21 19:53:48 -07:00
Jessie Frazelle 80e518f328 Merge pull request #14808 from cpuguy83/bump_md2man
Bump go-md2man to 1.0.3
Upstream-commit: dda1d66ac768a8be92ff6756cca4afcde3489fcf
Component: engine
2015-07-21 19:53:26 -07:00
Arnaud Porterie 8f8c0a2957 Merge pull request #13171 from jlhawn/archive_copy
docker cp to and from containers
Upstream-commit: c986f85f7397c915e6b29b6dff60db678cc8b72d
Component: engine
2015-07-21 16:59:44 -07:00
Dave Tucker 89ab877e9d golint: Fix issues in pkg/nat
Updates #14756

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: 15d01d6e6c57f4b8a39dddd2676a2d6914c62c77
Component: engine
2015-07-22 00:47:41 +01:00
Tibor Vass 0c513ce46b Merge pull request #14833 from icecrime/14756_update_lint_script
Update validate-lint script
Upstream-commit: 879f440a99264de555255a58521ea4c55499dd4e
Component: engine
2015-07-21 19:28:19 -04:00
Tibor Vass 5898d8c33d Merge pull request #14829 from RichardScothern/registry-tls
Configure TLS for private v2 registry mirrors.
Upstream-commit: 42533e323cc6f996cd3eda41172dfdc6affeacd9
Component: engine
2015-07-21 19:23:39 -04:00
David Calavera 8fccdeffc8 Merge pull request #14682 from duglin/Issue14621
Remove panic in nat package on invalid hostport
Upstream-commit: 36106a20cacb8f96b64da303f651bbd2160e24e3
Component: engine
2015-07-21 15:48:51 -07:00
Antonio Murdaca 35f67e056f Merge pull request #14830 from Microsoft/10662-removebadcomment
Windows: Remove erroneous comment only (no code change)
Upstream-commit: d52b2b98babf03df961cda17eefd721970dd387d
Component: engine
2015-07-22 00:39:58 +02:00
Josh Hawn b4919d1406 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)
Upstream-commit: e54b1e081ae15a71e758f7d2691dc2bff3f66e02
Component: engine
2015-07-21 15:30:20 -07:00
Richard Scothern 82b193c1f9 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>
Upstream-commit: 6b36a488e77c9d91c8eacb07053bff263bda04f3
Component: engine
2015-07-21 15:21:41 -07:00
Richard Scothern 62d1021452 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>
Upstream-commit: cb57b256892b7d6c046cf28e45b9114f28f07aa3
Component: engine
2015-07-21 15:21:25 -07:00
Josh Hawn 471920cd35 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)
Upstream-commit: 418135e7eac6e664834b8a9d09d8051ec296a48f
Component: engine
2015-07-21 15:19:52 -07:00
Josh Hawn daac8a1748 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)
Upstream-commit: 93c3e6c91ec5eb4202b86b44b011d06f5e048dab
Component: engine
2015-07-21 15:19:52 -07:00
Josh Hawn 0286d37224 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)
Upstream-commit: db9cc91a9ef7dea4c8d85f64578889cec3dd99b2
Component: engine
2015-07-21 15:19:52 -07:00
Arnaud Porterie 3abbd3cbb1 Update validate-lint script
Add a set of newly linted packages, and fix the script.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7f02cc420ab068f129ec24f3c7514a838bddb1ce
Component: engine
2015-07-21 15:02:46 -07:00
Tibor Vass e83cb90d7b Merge pull request #14820 from aaronlehmann/registry-dead-code
Remove dead code in registry package
Upstream-commit: 0d17cba922f3b773fd097ceb2354056515899107
Component: engine
2015-07-21 17:45:49 -04:00
John Howard 58f999ca51 Windows: Remove erroneous comment
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bd30d27636718b3ea576caa52807507d57283580
Component: engine
2015-07-21 14:25:08 -07:00
Arnaud Porterie 4ca43d5b83 Merge pull request #14805 from dave-tucker/golint_namesgen
golint: Lint pkg/namesgenerator
Upstream-commit: c88ce893a56a67c26a46baee8c9511a0c3ef6584
Component: engine
2015-07-21 13:45:31 -07:00
Antonio Murdaca acbea7273b Allow starting a container with an existing hostConfig which contains links
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 65121e5fce3851d7d1e8c8cd5d77dd3c9591d773
Component: engine
2015-07-21 22:10:00 +02:00
Aaron Lehmann 87771732a3 Remove unused types in registry package
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 9e76e184e4c4b7df90c594b5323b2e423688e490
Component: engine
2015-07-21 11:53:57 -07:00
Aaron Lehmann 17583ad6dc Remove dead code in registry package
The only uses of RequestAuthorization and its associated functions were
removed in 19515a7ad859b28c474d81e756ac245afcd968e3 ("Update graph to
use vendored distribution client for the v2 codepath")

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 962dc622d94a17a30a5926e8155da87a7e39e933
Component: engine
2015-07-21 11:45:53 -07:00
Josh Hawn 5ad9da5031 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)
Upstream-commit: c32dde5baadc8c472666ef9d5cead13ab6de28ea
Component: engine
2015-07-21 11:20:10 -07:00
Josh Hawn cea3f16dbe 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)
Upstream-commit: a74799b701f5a70e964ec528c6d731c8c93019e6
Component: engine
2015-07-21 11:03:25 -07:00
David Calavera c56394846e Merge pull request #14659 from calavera/promote_volumes_experimental_to_master
Promote volume drivers from experimental to master.
Upstream-commit: 3ee15acaadc3f25c90ea2c4de2e5ab1a12d8e042
Component: engine
2015-07-21 10:39:17 -07:00
Antonio Murdaca 03a7a170c0 Merge pull request #14815 from LK4D4/remove_tty_terminal
Remove unused TtyTerminal interface
Upstream-commit: d796bb9151d607c6f36a16ed909b0347a5cced84
Component: engine
2015-07-21 19:36:43 +02:00
Arnaud Porterie 0236ca4bfe Merge pull request #13617 from Microsoft/10662-sql
Windows: Statically linkable SQLite3
Upstream-commit: 943bf44686f18e2888a2a9b986d787e6ed728986
Component: engine
2015-07-21 10:12:40 -07:00
Alexander Morozov b6a0d280f9 Remove unused TtyTerminal interface
It was used only by integration tests, which now gone.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 6ae377ffa0c106749db1bcd6cf158f8b0056dea8
Component: engine
2015-07-21 09:56:28 -07:00
Alexander Morozov 8f6577a7cd Merge pull request #14780 from icecrime/14756_add_golint
Add golint to the development toolbox
Upstream-commit: e4f1cf787c50e0f4e97ea5d0aee5a7b4c5b40ff5
Component: engine
2015-07-21 09:50:58 -07:00
John Howard f8dc4be64b Windows: Statically linkable SQLite3
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 10bcaca914b32af29d8ce9974c5f5656a2f8cc1d
Component: engine
2015-07-21 09:33:46 -07:00
David Calavera bfde6861a0 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>
Upstream-commit: c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6
Component: engine
2015-07-21 09:32:44 -07:00
Antonio Murdaca 788cff7e65 Merge pull request #14801 from HuKeping/golint
golint: use golint to check package util
Upstream-commit: 06b922c63f660be431e4b678a50ae1ddb0dcf882
Component: engine
2015-07-21 18:09:39 +02:00
Hu Keping 4874e6060c golint: use golint to check package util
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 17ce34116af4e8c6b66d0c7906efcae2fd75efc6
Component: engine
2015-07-22 05:34:13 +08:00
Arnaud Porterie 5bcf01ef67 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>
Upstream-commit: 6cce8d18384a5ae1212e7b0f7b7ac9662a89c8c1
Component: engine
2015-07-21 09:00:36 -07:00
Alexander Morozov 7f0b167fb0 Fix cgroup parent tests
After merging mounting cgroups in container this tests doing wrong
checks. Cgroup paths could be prepended by other cgroups from host.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 844fc5f77c9443b4605949219a8a3c8523249025
Component: engine
2015-07-21 08:59:17 -07:00
Brian Goff 25af73dba8 Merge pull request #14765 from runcom/fix-dockerCmd-refactor
Refactor missed dockerCmd changes
Upstream-commit: 6c95040e3b75725cb7230d7f9a22fdf36a4bb03a
Component: engine
2015-07-21 11:53:28 -04:00
Alexander Morozov 84681c30e3 Merge pull request #14609 from ewindisch/apparmor-policy
Move AppArmor policy to contrib & deb packaging
Upstream-commit: 380959dd68cd56e60a2ea93cd7f26c8d88135483
Component: engine
2015-07-21 08:48:02 -07:00
Antonio Murdaca ce0ada60b7 Merge pull request #14796 from WeiZhang555/golint-network
golint on daemon/network package
Upstream-commit: 9818d8fa22b919259bd46b93427fb9021a368389
Component: engine
2015-07-21 17:37:40 +02:00
Dave Tucker a0b92d8385 golint: Lint pkg/namesgenerator
Also addded a couple more tests

Updates #14756

Signed-off-by: Dave Tucker <dt@docker.com>
Upstream-commit: c5667bc5690d6004db4e515cef1865e093da7e3b
Component: engine
2015-07-21 16:33:34 +01:00
Eric Windisch 74cf202b4f Move AppArmor policy to contrib & deb packaging
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.

- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 80d99236c1ef9d389dbaca73c1a949da16b56b42
Component: engine
2015-07-21 11:05:53 -04:00
Zhang Wei b04bea4cce golint on daemon/network package
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 7be8336fb54ae2907c8f6549f26272c102a867af
Component: engine
2015-07-21 22:49:49 +08:00
moxiegirl 46bf07aaed Merge pull request #14725 from charleswhchan/issue-14433
Issue #14433
Upstream-commit: 1ca737875d88384cfa3f36732b977ce07f60126a
Component: engine
2015-07-21 07:48:54 -07:00
Brian Goff b8b81760da Bump go-md2man to 1.0.3
Fixes an issue with curly braces being escaped when they should not be.
This was particularly an issue in places where `--format '{{ ...  }}'`
is used in the man docs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: dd7d4d1101102eb1d958bb948369a25ec08ab01d
Component: engine
2015-07-21 10:42:02 -04:00
Arnaud Porterie 84053f7c10 Merge pull request #14778 from thaJeztah/remove-rhel6-rpm-from-generate
Remove reference to CENTOS6 from generate script
Upstream-commit: a7d61882c0b65e9ccc0b64b019b63140164fb507
Component: engine
2015-07-21 07:27:29 -07:00