Commit Graph

11997 Commits

Author SHA1 Message Date
a56a6166e9 update docs for memory and memoryswap
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0c0f0d5ab41cae62a441502f26c1c300fc61e25d
Component: engine
2015-02-05 09:12:56 +08:00
c3812a0984 add check for memoryswap when create
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 72f356be6a662ed92e04ba9c58acac63c5a15264
Component: engine
2015-02-05 09:05:27 +08:00
7f4431424b Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
Fix a small spelling error in the dm.blkdiscard docs
Upstream-commit: 6dd2364dc2c6ba0d95a5dc52dae447c80d9af5d0
Component: engine
2015-02-04 17:42:31 -08:00
a31c4ae7c4 Fix a small spelling error in the dm.blkdiscard docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Component: engine
2015-02-05 10:57:33 +10:00
e5fc776e72 Add an initial list of new features in Docker Engine 1.5.0
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 16a15ea5812e3dce0f23e1f4ac7ac576f45bfeb4
Component: engine
2015-02-05 10:37:15 +10:00
13f79dd103 Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
Upstream-commit: 1cc774b4faebdc11f419add5467a6bc19288bce9
Component: engine
2015-02-05 10:21:00 +10:00
55dbcd816d Merge pull request #10566 from jfrazelle/fix-overlay-unit-tests-for-btrfs
Fix for running unit tests on a 3.18 kernel with btrfs.
Upstream-commit: fd1bdf21206f41de95ebc5310ac00499829a4943
Component: engine
2015-02-04 15:41:06 -08:00
e15bc1c2fe Fix for running unit tests on a 3.18 kernel with btrfs.
Was failing on overlay before and comparing the wrong error.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c809fc552b65ea90ed695d39c24447aa3dbc7891
Component: engine
2015-02-04 13:51:44 -08:00
160a9d328c Fix compilation on Go 1.3.3
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4855612aaecf7719edc36693d402279c743be7fc
Component: engine
2015-02-04 13:35:20 -08:00
74b86f866b Amend run help for --user to include GUID
The -u/--user flag optionaly takes a group/gui. This change documents this behavior and specifies the complete format of the value.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>

Added a missed semi-colon for consistency with other messages.

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>
Upstream-commit: 46d4e491c8a1394596e824ac65b360f6d7211c6f
Component: engine
2015-02-04 21:27:02 +01:00
8423899da1 Merge pull request #10547 from duglin/Issue10214
Pretty the help text
Upstream-commit: a271eaeba224652e3a12af0287afbae6f82a9333
Component: engine
2015-02-04 11:31:18 -08:00
2ac3861c66 Merge pull request #10522 from SvenDowideit/fix-swarm-links
use the same paths as in the swarm repo, so that their links magically w...
Upstream-commit: 8a91926cd90b10e1be097eb2adb2ac58de1889a0
Component: engine
2015-02-04 10:19:19 -08:00
f36df9e537 Merge pull request #10542 from SvenDowideit/ets-spelling-in-userguide
Spelling mistake in dockerlinks
Upstream-commit: a1ce6c7d444cd6534e190e77d920243d3776796d
Component: engine
2015-02-04 10:17:52 -08:00
dcd5286270 Merge pull request #10539 from dmcgowan/v2-registry-revert-push
Revert push to v2 official registry
Upstream-commit: 23196cdebbaabf00d54db56d5587feff975ca8ff
Component: engine
2015-02-04 10:01:26 -08:00
d859bcf5f3 Limit push and pull to v2 official registry
No longer push to the official v2 registry when it is available. This allows pulling images from the v2 registry without defaulting push. Only pull official images from the v2 official registry.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 88fdcfef02cdc8b4fcff10cded6a89a42a360ec1
Component: engine
2015-02-04 09:21:36 -08:00
013dbb146f Pretty the help text
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2203b37733e76d653cfe3b0ec5870786076adce7
Component: engine
2015-02-04 07:59:16 -08:00
5bd881552f fix comments typos
s/propogated/propagated

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: ef3192f161a89bbff11d88da523be61484a822f2
Component: engine
2015-02-04 10:47:37 +08:00
e21086902c Spelling mistake in dockerlinks
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ea6db8af18c9eee2147d78f987cdacacd37e93fb
Component: engine
2015-02-04 12:12:46 +10:00
7d32f56a80 Merge pull request #10507 from jbruni/patch-1
Remove File List
Upstream-commit: 165ea5c158cff3fc40d476ffe233a5ccc03e7d61
Component: engine
2015-02-03 17:33:15 -08:00
f4953777f0 Merge pull request #10538 from vieux/update_MAINTAINERS
update MAINTAINERS file
Upstream-commit: 31c6419e58fb20ae7a013d361f32ed00bb4d6f3f
Component: engine
2015-02-03 17:12:05 -08:00
b3f93e19b9 Merge pull request #10484 from thaJeztah/fix-contributing-link
Fix broken link to project/MAINTAINERS.md
Upstream-commit: 944f76d444674b3e1969264925c66847b7a6dfa1
Component: engine
2015-02-03 19:20:55 -05:00
1d044a31f4 add crosbymichael and Github -> GitHub
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 2e9c498e347bdd15befc5e38ce831d7b07a828aa
Component: engine
2015-02-03 23:04:37 +00:00
167e1b82bf Merge pull request #10477 from liusdu/liusdu_typo
delete duplicated word in registry/session.go
Upstream-commit: c98007f9d2292b4075e23ceea056209705596ab6
Component: engine
2015-02-03 14:38:47 -08:00
99f316a4fe Merge pull request #10480 from yihangho/docstypo
Fix a tiny typo.
Upstream-commit: 0018afebb81365ed8920bbc7fe829a5bed744b81
Component: engine
2015-02-03 14:37:35 -08:00
ac0cbb6e4b Merge pull request #10483 from Thell/master
Update dockerfile_best-practices.md
Upstream-commit: 71368c520eb4b1dc0f9ff5f5bd8cf599e1580e3a
Component: engine
2015-02-03 14:36:24 -08:00
2c42071fed update MAINTAINERS file
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 8475795f76eed9d76cef409f636624936b3a2ec4
Component: engine
2015-02-03 19:50:46 +00:00
d0e06c3ede Merge pull request #10524 from icecrime/10513_carry_failed_tests
Ensure Dockerfile in context
Upstream-commit: 989ca9b357ba6e229aa53c881b2400a192edfc36
Component: engine
2015-02-03 12:05:43 -05:00
152c0086ab Merge pull request #10519 from jfrazelle/burn-in-a-fire-drone
Remove drone.
Upstream-commit: b71108da87dbc25c50784d35c63f9e39d4797813
Component: engine
2015-02-03 18:40:16 +02:00
79c7bc906b Fix client-side validation of Dockerfile path
Arguments to `filepath.Rel` were reversed, making all builder tests to
fail.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 22e2254c744d1ed2d75f3cdc802e4347727dea6a
Component: engine
2015-02-02 23:42:18 -08:00
3ba1373e01 builder: prevent Dockerfile to leave build context
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 73d5baf585e3ef55864abeef43d45fe0b3a1c2bc
Component: engine
2015-02-02 23:40:24 -08:00
56a2a654e8 Add an API test for docker build -f Dockerfile
I noticed that while we have tests to make sure that people don't
specify a Dockerfile (via -f) that's outside of the build context
when using the docker cli, we don't check on the server side to make
sure that API users have the same check done. This would be a security
risk.

While in there I had to add a new util func for the tests to allow us to
send content to the server that isn't json encoded - in this case a tarball

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 198ff76de59a600ce900497fd4a6131ee4448c48
Component: engine
2015-02-02 23:40:20 -08:00
5a9b034c63 Merge pull request #10512 from crosbymichael/stats-prepopulate
Print zeros for initial stats collection on stopped container
Upstream-commit: 01b46c21aac9f533b7515d86de1bcf1d1befa247
Component: engine
2015-02-02 21:49:03 -08:00
cfc914c811 use the same paths as in the swarm repo, so that their links magically work
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1da2abb596178a3cb67ef83686f4425c31987640
Component: engine
2015-02-03 13:55:08 +10:00
e0ba739be5 Docker attach documentation didn't make sense to me
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: e58fdaae056491207349df8747289ed52e04462a
Component: engine
2015-02-03 11:53:14 +10:00
43574457fc Merge pull request #10518 from LK4D4/fix_vet_errors
Fix some go vet errors
Upstream-commit: 662dffee4fccbf6f7853605c8f558ec21ee668fe
Component: engine
2015-02-02 20:49:19 -05:00
94427ae72d Merge pull request #10509 from chenhanxiao/cli-events-since
docs: change events --since to fit RFC3339Nano
Upstream-commit: 895f9a679ba66f3e531b87f5037db7664ceae2c1
Component: engine
2015-02-03 01:03:40 +01:00
5507a789fd Remove drone.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 4904f1f31fec2929c26b769fcfe20fbbcbd7136f
Component: engine
2015-02-02 15:19:20 -08:00
9751490a58 Print zeros for initial stats collection on stopped container
When calling stats on stopped container's print out zeros for all of the
values to populate the initial table.  This signals to the user that the
operations completed and will not block.

Closes #10504

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: ab4f9495ba9e3bd31ccb3800f2c574771b86744a
Component: engine
2015-02-02 15:01:13 -08:00
3ae87a3a28 Fix some go vet errors
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4ee05a4d3e6f9ad955d96075a1e63d59ed73ac78
Component: engine
2015-02-02 14:53:20 -08:00
c8bbb49221 Merge pull request #10455 from ashahab-altiscale/9875-lxc-symlink
Fixes symlink, container size, and kmsg tests
Upstream-commit: 382f187b1a4d038b45d0e7965a0af8e158a2e9da
Component: engine
2015-02-02 13:13:27 -08:00
a661737346 docs: change events --since to fit RFC3339Nano
PR6931 changed time format to RFC3339Nano.
But the example in cli.md does not changed.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: d619b5594ba136ab285b93128bbe8fe246678488
Component: engine
2015-02-02 22:39:03 +08:00
1f18971794 Remove File List
This list is outdated. It could be updated instead of removed... but why should it be maintained? I do not see a reason.

Signed-off-by: João Bruni <contato@jbruni.com.br>
Upstream-commit: aceb735dbaa7845aeacfdaa62656de558554d8b7
Component: engine
2015-02-02 09:47:19 -02:00
ee0b731a9a docs: fix another typo in docker-build man page
s/arbtrary/arbitrary

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: f0c9818eba0a9220766b020612f3b1d63c7d9c80
Component: engine
2015-02-02 10:39:28 +08:00
00cb8c7336 Merge pull request #10478 from bcicen/fix-readme-project-url
fix project url in readme to point to the correct location
Upstream-commit: 9273040a208ce2b9c2bf0ad0bc09068b32143ff8
Component: engine
2015-02-02 00:38:40 +01:00
8d15c02d80 Merge pull request #10464 from johnktims/patch-1
Fix documentation typo
Upstream-commit: 74475325bce174032bff10db2e0d86bc96eaf3ab
Component: engine
2015-02-02 00:12:45 +01:00
997f07bcec Merge pull request #10472 from jlhawn/handle_mux_route_url_bug
Handle gorilla/mux route url bug
Upstream-commit: f8331f700babd58d9759f9d0d7d1cb2de0d14346
Component: engine
2015-01-31 19:52:51 -08:00
458fcd5a6c Fix token basic auth header issue
When requesting a token, the basic auth header is always being set even
if there is no username value. This patch corrects this and does not set
the basic auth header if the username is empty.

Also fixes an issue where pulling all tags from a v2 registry succeeds
when the image does not actually exist on the registry.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 8bfdad9a0dee26b45b15f985977769ef37888f8a
Component: engine
2015-01-31 15:12:34 -08:00
6bb03bfe90 Remove "OMG IPV6" log message
Signed-off-by: Erik Hollensbe <erik+github@hollensbe.org>
Upstream-commit: 8d7683af864be7e8e15442a354653d7a0c0f645b
Component: engine
2015-01-31 13:21:06 -08:00
1885f8c5c0 Handle gorilla/mux route url bug
When getting the URL from a v2 registry url builder, it does not
honor the scheme from the endpoint object and will cause an https
endpoint to return urls starting with http.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 843f3045bd84987dc9410425b1c116dd957b38c5
Component: engine
2015-01-31 12:54:57 -08:00
2b248fd044 Merge pull request #10487 from icecrime/racy_test_registry
Fix race in test registry setup
Upstream-commit: fcdfc8ccc86044f06da0b47dc028894fe3ea25f9
Component: engine
2015-01-31 15:47:09 -05:00