Commit Graph

20395 Commits

Author SHA1 Message Date
7acff5d3a0 Add completion for stats.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b3dfe1a63a51639400e691939b0879e9b0807703
Component: engine
2015-01-26 11:19:29 -08:00
67effd66f9 Remove omitempty json tags from stucts
When unmarshaling the json response from the API in languages to a
dynamic object having the omitempty field tag on types such as float64
case the key to be omitted on 0.0 values.  Various langages will
interpret this as a null when 0.0 is the actual value.

This patch removes the omitempty tags on fields that are not structs
where they can be safely omited.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 44f4c95c0ece887023d3ad7ab9c4f147c81d9d3f
Component: engine
2015-01-26 11:16:29 -08:00
7f109df3b1 Merge pull request #10194 from jfrazelle/lxc-test-fixes
ignore exec tests when passing DOCKER_EXECDRIVER lxc
Upstream-commit: a3c5223b2a7f2a31c77910e93c2229bf01c41955
Component: engine
2015-01-26 11:07:52 -08:00
cc5294bd01 Fix bind-mounts only partially removed
When calling delete on a bind-mount volume, the config file was bing
removed, but it was not actually being removed from the volume index.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b4283209d55289abb2c5b63df949a27c2704f5af
Component: engine
2015-01-26 12:38:20 -05:00
d3ac88b1d5 Merge pull request #10290 from tianon/sorry-windows-norelease4u
Remove windows from the list of supported platforms
Upstream-commit: 94e169b44f3bcc346c7d0f9a733a8c76f1eace55
Component: engine
2015-01-26 08:44:08 -08:00
448d0bc3f3 cleanup of docker tag command code
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 573cd092a5f467d0fab1acbd9cc0b80040cae565
Component: engine
2015-01-26 09:15:32 -05:00
917ff61a98 Merge pull request #10333 from jlhawn/image_json_schema_reword
Updated image spec docs to clarify image JSON
Upstream-commit: 283597ad37446ccad57f6ba881652ee6f67e576e
Component: engine
2015-01-26 07:49:44 -05:00
e04792e240 docs: shrink sprites-small_360.png
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 6bbf19dfbe44a06dadb755e08069b5ee031f5312
Component: engine
2015-01-26 08:11:20 +02:00
5933252d75 Merge pull request #10330 from unclejack/remove_autodetect_log
pkg/archive: remove tar autodetection log line
Upstream-commit: 8d5774e60bfcf4ec3fdd571f73424ef1adc586cb
Component: engine
2015-01-26 07:25:22 +02:00
a12f665228 Proposal for an improved project structure.
Note: this deprecates the fine-grained, high-overlap cascading MAINTAINERS files,
and replaces them with a single top-level file, using a new structure:

* More coarse grained subsystems with dedicated teams of maintainers
* Core maintainers with a better-defined role and a wider scope (if it's
not in a subsystem, it's up to the core maintainers to figure it out)
* Architects
* Operators

This is work in progress, the goal is to start a conversation

Signed-off-by: Solomon Hykes <solomon@docker.com>
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 77f840fb8bc679b8d0c3eb4ce7f443f904b7f9ac
Component: engine
2015-01-25 20:00:59 +00:00
4bcd09aacc Merge pull request #10219 from albers/bash-completion
Bash completion for the daemon flags
Upstream-commit: b1f2fdeee213c437a363db9eda235444ffdcc4a5
Component: engine
2015-01-25 10:25:22 -08:00
3bf93236d1 Allow empty layer configs in manifests
Before the V2 registry changes, images with no config could be pushed.
This change fixes a regression that made those images not able to be
pushed to a registry.

Signed-off-by: Euan Kemp <euank@euank.com>
Upstream-commit: d477d42dd3e6a98f82c6ed2abb1dfeeb2782539f
Component: engine
2015-01-24 14:27:37 -08:00
f145851625 Updated image spec docs to clarify image JSON
The title `Image JSON Schema` was used as a header in the section
which describes the layout and fields of the image metadata JSON
file. It was pointed out that `JSON Schema` is its own term for
describing JSON in a machine-and-human-readable format, while the
word "Schema" in this context was used more generically to say that
the section is meant to be an example and outline of the Image JSON.

http://spacetelescope.github.io/understanding-json-schema/

This section now has the title `Image JSON Description` in order
to not cause this confusion.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 71763636f232477b0c890e0506b7b858505f1b33
Component: engine
2015-01-24 10:21:11 -08:00
193affd9cc Fix a minor typo
Docker inspect can also be used on images, this patch fixed the
minor typo in file docker/flags.go and docs/man/docker.1.md

Signed-off-by:  DiuDiugirl <sophia.wang@pku.edu.cn>
Upstream-commit: 471006c02f03d9451721dfbd7e3d62f0db0fc7c7
Component: engine
2015-01-24 15:08:33 +08:00
d9de984b24 Merge pull request #10315 from jfrazelle/overlay-zfs
Blacklist zfs with overlay
Upstream-commit: 990a3e30fa66e7bd3df3c78c873c97c5b1310486
Component: engine
2015-01-24 09:04:37 +02:00
299d22c2cc pkg/archive: remove tar autodetection log line
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: a5cc1c556dcd6dfe5c1aed4bec95aaff6ddfad61
Component: engine
2015-01-24 08:43:03 +02:00
45af1fde18 Revert progressreader to not defer close
When progress reader closes it overwrites the progress line with the full progress bar, replaces the completed message.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 0091c490dd31b9b9a5248cacaaf1f515ff26a5e7
Component: engine
2015-01-23 17:24:05 -08:00
36ea1c732a Move links exec test & exec dir test.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 43d1c2010125e3c1ef1013ee2e8b4d9371d70d77
Component: engine
2015-01-23 16:20:46 -08:00
83a3f5c28f Update project/make.sh to use execdriver buildtag if passed.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 547c95957679672c3ed2e97c7a2950d3c0a03321
Component: engine
2015-01-23 16:18:39 -08:00
34351a6734 Add build flag to exec test.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ecdbc1a0aff40fa28389d1971528641e2824e5a9
Component: engine
2015-01-23 16:18:39 -08:00
3e848a2a63 Move InspectExecID test to exec.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 957cbdbf302750f3fb3467237bebf29d87234208
Component: engine
2015-01-23 16:18:39 -08:00
cc1de71aa0 Fix missing err assignment in bridge creation
Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
Upstream-commit: d5c78a4c07929eda2d448f9b2a09fb3d65a75a2d
Component: engine
2015-01-23 14:48:28 -08:00
3acf78c713 Use filepath instead of path
Currently loading the trust key uses path instead of filepath. This creates problems on some operating systems such as Windows.

Fixes #10319

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2cd5b7dae80c5451b729a0be2ade03cbdf2c5c26
Component: engine
2015-01-23 14:44:30 -08:00
56fd7d2515 Blacklist zfs with overlay
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ec953b0e7ba89ff3b13b3187d9cee0b8c232b4ff
Component: engine
2015-01-23 14:00:15 -08:00
1c5b6614c3 Make debugs logs suck less.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c49cd3d2a51ad6d2304c24f7b609cde804a0d6c5
Component: engine
2015-01-23 13:20:29 -08:00
cc58d5c62d Always store images with tarsum.v1 checksum added
Updates `image.StoreImage()` to always ensure that images
that are installed in Docker have a tarsum.v1 checksum.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: ba3bad66f92da057dba2a43ff9a512cf7ad72375
Component: engine
2015-01-23 11:30:27 -08:00
513e38914d document the ExtraHosts parameter for /containers/create for the remote API
I think this was added from version 1.15.

Signed-off-by: Tony Miller <mcfiredrill@gmail.com>
Upstream-commit: 54c10fe81d1894f9683293601a53a0d87a0d7fbd
Component: engine
2015-01-23 23:52:04 +09:00
28feccbe1b Stop and Kill commands made robust
If stop/kill command hits a short window between process' exit and
container's cleanup, it will no longer fail with 'no such process'
error.

Resolves #10182

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 310337dc89a78cbe245977236f02dcda73728df8
Component: engine
2015-01-23 10:26:13 +01:00
8b134ecd31 add args support for check-config.sh
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: aac6090f2df3cc9192d1813e3c1f48b882f063d4
Component: engine
2015-01-23 16:36:55 +08:00
dfa9fbab62 Merge pull request #10292 from SvenDowideit/pr_out_update_using_supervisord_md
Update using_supervisord.md
Upstream-commit: d3a6a53fa5d399ed0d728e48eed8ea38bca9dc2c
Component: engine
2015-01-23 00:09:25 -05:00
a15322433b Merge pull request #9952 from flowlo/doc-https
doc: Improve article on HTTPS
Upstream-commit: 992beb2a962a38e7958c14f6188098fe1814c9aa
Component: engine
2015-01-23 12:34:57 +10:00
a76944151d comment out the docker and curl lines we'll run later
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eaf1b88212bb10019cf1d7b1555a305c12001f06
Component: engine
2015-01-23 12:31:39 +10:00
bf1ffd6668 Merge pull request #10260 from acbodine/docs_api_attach_websocket
Adds docs for /containers/(id)/attach/ws api endpoint
Upstream-commit: fa79e18c20b5ce1c7a6c2c70e5e120d73a59e165
Component: engine
2015-01-23 10:51:11 +10:00
422d703cc0 Update using_supervisord.md
Fix factual error

change made by: GennadySpb <lipenkov@gmail.com>

Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 99dc224d850a8838f42b9f41229b484197f75fa5
Component: engine
2015-01-23 10:43:57 +10:00
da0e87ebb9 Merge pull request #10288 from tiborvass/fix-test-attach
integration-cli: wait for container before sending ^D
Upstream-commit: 54ddb9b41d550fea021efb9f77b7993acf3d6f75
Component: engine
2015-01-22 15:07:46 -08:00
44958a29f2 Remove windows from the list of supported platforms
Since it can still be tested natively without this, this won't cause any harm while we fix the tests to actually work on Windows.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 47769994e5cba81a96529b418052afce7a6d51a3
Component: engine
2015-01-22 15:42:17 -07:00
551d8c12b8 integration-cli: wait for container before sending ^D
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: a124bfaef37a9d209de881325dbe653d9b07ef4d
Component: engine
2015-01-22 17:28:35 -05:00
a5a927b102 Merge pull request #10282 from tiborvass/fix-test-restart-policy-always
integration-cli: Fix race in restart loop
Upstream-commit: 5a6f84ce089f7a562010564ad7e2ebcb60a39d5d
Component: engine
2015-01-22 13:17:23 -08:00
3685fbd1c9 Fix inconsistent formatting
Colon was bold, but regular at other occurences.

Blame cf27b310c4fc8d2c13ba181398a628d03e1e3c58

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: a51554988e615b317e95125f5612a28c3bff8e8a
Component: engine
2015-01-22 21:46:01 +01:00
f5baf563e6 doc: Minor semantical/editorial fixes in HTTPS article
"read-only" vs. "only readable by you"

Refer to:
https://github.com/docker/docker/pull/9952#discussion_r22690266

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 048b20e58a1b9d516dd6fb34676d765ebd5a8959
Component: engine
2015-01-22 21:37:39 +01:00
1894376959 doc: Editorial changes as suggested by @fredlf
Refer to:
 * https://github.com/docker/docker/pull/9952#discussion_r22686652
 * https://github.com/docker/docker/pull/9952#discussion_r22686804

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 6ca2875e580e16a309eb9c9486bb358bde3622ff
Component: engine
2015-01-22 21:37:39 +01:00
a50020fe51 doc: Improve article on HTTPS
* Adjust header to match _page_title
 * Add instructions on deletion of CSRs and setting permissions
 * Simplify some path expressions and commands
 * Consqeuently use ~ instead of ${HOME}
 * Precise formulation ('key' vs. 'public key')
 * Fix wrong indentation of output of `openssl req`
 * Use dash ('--') instead of minus ('-')

Remark on permissions:

It's not a problem to `chmod 0400` the private keys, because the
Docker daemon runs as root (can read the file anyway) and the Docker
client runs as user.

Signed-off-by: Lorenz Leutgeb <lorenz.leutgeb@gmail.com>
Upstream-commit: 02a793c6a133f46129d0fc83ce218d3a92f1e644
Component: engine
2015-01-22 21:37:39 +01:00
7a156f1702 Merge pull request #10234 from dmcgowan/libtrust-key-fix
Fix daemon key file location
Upstream-commit: 10ab6dcb4f8f63ffab44023d286403c494fa24b8
Component: engine
2015-01-22 11:54:03 -08:00
64ed8c80ae Fix nits and defers
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d55e977cf5963f8ae5efdfbee458727f704be398
Component: engine
2015-01-22 11:22:31 -08:00
e1654ed3ab Merge pull request #10259 from jfrazelle/wording-of-image-verification
Change the wording of image verification warning.
Upstream-commit: 211513156dc1ace48e630b4bf4ea0fcfdc8d9abf
Component: engine
2015-01-22 11:14:28 -08:00
4cb12b37f1 integration-cli: Fix race in restart loop
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 752a0d6f34ee3c92dc877273c33b8cd0239fda71
Component: engine
2015-01-22 14:06:24 -05:00
54a3834558 Add key migration integration test
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 42612ff6dba2d885a0c55af80128201a4d5166cb
Component: engine
2015-01-22 10:51:04 -08:00
d625ce9494 Add TODO lines for windows
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: a34a7930b5c1e9a1e6ddd4a40b1810a86f7d24ab
Component: engine
2015-01-22 10:29:15 -08:00
e6b4861d6f Merge pull request #10266 from bobrik/no-extra-assertion
Not doing extra assertion for io.Closer
Upstream-commit: c77c67cf87f77ad4da46ade515a4c912a3c612d9
Component: engine
2015-01-22 10:25:23 -08:00
4f2ab4bd87 Merge pull request #10244 from dmcgowan/registry-panic-fix
Fix write after close on http response
Upstream-commit: ef33efc9b9879a8397288b1bd54d8f3fd2460e56
Component: engine
2015-01-22 10:23:11 -08:00