Commit Graph

16947 Commits

Author SHA1 Message Date
ae18180fac Add AppArmor policy for the engine
Wraps the engine itself with an AppArmor policy.

This restricts what may be done by applications
we call out to, such as 'xz'.

Significantly, this policy also restricts the policies
to which a container may be spawned into. By default,
users will be able to transition to an unconfined
policy or any policy prefaced with 'docker-'.

Local operators may add new local policies prefaced
with 'docker-' without needing to modify this policy.
Operators choosing to disable privileged containers
will need to modify this policy to remove access
to change_policy to unconfined.

Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 39dae54a3f40035b1b7e5ca86c53d05dec832ed2
Component: engine
2015-07-22 14:20:50 -04:00
b066063905 Merge pull request #14699 from estesp/docker-ps-format
Carry #10255: Docker ps format
Upstream-commit: 40b922418cd48f8b414d8e10fdd72ed2095697e1
Component: engine
2015-07-22 10:58:34 -07:00
24e8ba57a5 Merge pull request #14858 from icecrime/14756_update_linted_packages
Update linted package list
Upstream-commit: fe68ac806b887afda31bbdbd8e069f697f7fa76f
Component: engine
2015-07-22 10:11:51 -07:00
e60763fbc1 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)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
2015-07-22 12:51:16 -04:00
6fe7577ea8 Merge pull request #14217 from ankushagarwal/ubuntu-15.04
Add support for 15.04, add systemd note for 15.04
Upstream-commit: 7d8859a4f54ce86b368860890f9167b910827023
Component: engine
2015-07-22 08:56:02 -07:00
596da1de67 Update linted package list
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: b7184f857489bee6b547eb10a3dfefcd3e420767
Component: engine
2015-07-22 08:46:42 -07:00
50e8a78638 Merge pull request #14851 from bfirsh/golint-integration-cli
Golint integration-cli
Upstream-commit: 875fffdff886205d096ab348d94b5079885f17fb
Component: engine
2015-07-22 11:28:19 -04:00
9ac57ffd87 Merge pull request #14790 from hqhq/hq_golint_build
Fix golint warnings for builder
Upstream-commit: a751c0a52fa5c845631db8de285f4c0a809580bb
Component: engine
2015-07-22 08:17:04 -07:00
4c6f54e228 Merge pull request #14817 from runcom/golint-pkg-mount
pkg: mount: golint
Upstream-commit: f0d0a52d8029f573c03a5b462b9aedf266b5fdb1
Component: engine
2015-07-22 09:23:26 -04:00
d251982e99 Merge pull request #14802 from rhatdan/error
If a user hits this error it would be helpful to know tagstore name.
Upstream-commit: a10cb08bbbb60ffa8b83ff919a9d7ea68bf222e0
Component: engine
2015-07-22 06:17:38 -07:00
fe204aada6 Merge pull request #14850 from runcom/14846-fix-get-images-search-content-type
Fix wrong Content-Type returned by /images/search API
Upstream-commit: 5328cc346f56beae2f5a230d445ebdc5b784e6c1
Component: engine
2015-07-22 06:16:16 -07:00
6aa4de764e Fix golint warnings for integration-cli
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 6b3c928140193f911b73f87bb8b07f54bba5a63a
Component: engine
2015-07-22 14:03:50 +01:00
c3fd270a2c Merge branch 'master' of github.com:docker/docker into error
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4815fdc334c5b479095b3d16657b2321ef76cb0c
Component: engine
2015-07-22 08:06:19 -04:00
4df93cb58f 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>
Upstream-commit: 1a5d6a94c9e4c099354d9125ea857f6277eca0b7
Component: engine
2015-07-22 11:07:41 +02:00
e1e5cbd789 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>
Upstream-commit: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d
Component: engine
2015-07-22 10:26:10 +02:00
1167da6b6d Merge pull request #14821 from stevvooe/coding-style-guidelines
Adding Go coding style guidelines
Upstream-commit: 757c4f0d5cbc30cf2455fbd412e50368b2b933a1
Component: engine
2015-07-22 09:08:43 +02:00
2d8d0361a7 Merge pull request #13711 from calavera/version_volumes_inspect
Expose new mount points structs in inspect.
Upstream-commit: 50d2597e490c4636ee8cacabf34bb9ed3e21d3fc
Component: engine
2015-07-22 09:02:00 +02:00
43c8d7a97f Fix golint warnings for builder
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8c4a282a5719455cb5c63b917deb2a2042eed685
Component: engine
2015-07-22 13:29:03 +08:00
dbf636ed08 Merge pull request #14842 from hqhq/hq_remove_rootuid
Remove unused parameter in NewTtyConsole
Upstream-commit: 30b951ff08503bb455ffde8ecd0cfa630bc277ff
Component: engine
2015-07-21 21:37:21 -07:00
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
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
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
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
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
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
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
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
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
e5400db724 Remove unused parameter in NewTtyConsole
It's introduced in
68ba5f0b69c9f38 (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>
Upstream-commit: af3059855c0b59c08b115a70d3f61b0fab3270de
Component: engine
2015-07-22 10:32:31 +08:00
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
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
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
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
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
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
b821d19c27 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>
Upstream-commit: 1c3cb2d31ea722e2c174bf78eda62fec6949fb8b
Component: engine
2015-07-21 15:33:05 -07:00
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
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
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
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
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
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
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
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
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
c84809df6c Adding Go coding style guidelines
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: d57ea8da25d791a5616576d2cc6f46b62b627440
Component: engine
2015-07-21 13:47:02 -07:00
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
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
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
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