15181abee7
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
Upstream-commit: 6deec021e5bbfd1942cfacb34c6593379e8b8c30
Component: engine
2015-12-02 22:28:28 +01:00
d55350cb73
Merge pull request #18376 from jfrazelle/fix-default-shm-size
...
fix default shm size in test
Upstream-commit: 61773e5cbf62badf41c6c9d110fca2e7b036a6ac
Component: engine
2015-12-02 12:54:07 -08:00
5811737ebb
Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
...
Carry 17293 add examples in search
Upstream-commit: d410cd47518b323064994f80022927a45b4e22c2
Component: engine
2015-12-02 21:52:52 +01:00
d7c300489b
fix default shm size in test
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 4354b348ad6f9a585c57d37147c2a893a2d873da
Component: engine
2015-12-02 12:43:51 -08:00
01641ba275
Merge pull request #18371 from sallyom/dontReturnNonError
...
don't return error if can't delete non-existing container
Upstream-commit: aa2ca5d93c2b30ba13ff67820a49d6f570323576
Component: engine
2015-12-02 11:59:50 -08:00
b43875ed4c
Merge pull request #18369 from LK4D4/misleading_rm
...
daemon/delete.go: use less confusing naming of functions
Upstream-commit: f8364c013db9fe8483f2c44a513eaea473f54ebe
Component: engine
2015-12-02 11:57:18 -08:00
a7b1157339
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
Upstream-commit: 8f1f53f735e278bb23bb41d9387a75786d7ec1dc
Component: engine
2015-12-02 11:49:51 -08:00
4ceb4f0c9f
Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation
...
[carry] configuring DNS options on systemd
Upstream-commit: f4176f91690a16b08c320984e17c049098d3f1f7
Component: engine
2015-12-02 11:39:18 -08:00
96c08be56e
Merge pull request #18285 from hqhq/hq_fix_swappiness
...
Set default MemorySwappiness when adapt
Upstream-commit: f411b101acdeefa731dc9e03dc75fbbd6ba816c6
Component: engine
2015-12-02 14:25:08 -05:00
9a973af9b7
Merge pull request #13587 from rhatdan/volume-tmpfs
...
Add tmpfs as a valid volume source command.
Upstream-commit: d4be46def4660f2dea090646f8d768f38c6fd520
Component: engine
2015-12-02 11:16:49 -08:00
8ce05800f4
daemon/delete.go: use less confusing naming of functions
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 828f63f1abbad4246bd5198f02c9c34ce0d44b2b
Component: engine
2015-12-02 11:10:14 -08:00
df1c14dfd2
don't return error if can't delete non-existing container
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: bfa5027e96a6a5532c7cc89bd00be219082833fa
Component: engine
2015-12-02 13:48:59 -05:00
e9b5c8b47b
Merge pull request #18240 from pospispa/Improvement-of-docker-top-Man-Page
...
Improvement of docker top Man Page
Upstream-commit: 10b30cf09c42904d8072a64c1d0ebd96a91ad8f3
Component: engine
2015-12-02 10:29:00 -08:00
9c256bfc19
Merge pull request #18368 from brahmaroutu/gccgo_fix
...
fix the Dockerfile.gccgo for new dependency
Upstream-commit: e274db94dd16e3a8439972cbe36d0dbaccf7e57a
Component: engine
2015-12-02 10:03:29 -08:00
72a4a2701c
Merge pull request #17769 from tianon/vendor-windows
...
Fix Windows support in .vendor-helpers.sh
Upstream-commit: 289251d088959076d0e8a0335a4b028d3453d486
Component: engine
2015-12-02 10:02:08 -08:00
9fd5cc2301
Improvement of docker top Man Page
...
Some users expect that the `docker top $CONT` command displays information from the inside container perspective.
They expect that the `docker top $CONT` command displays same information as the `docker exec $CONT ps -ef` command. But it does not.
That's why the `docker top` man page shall explicitly state that the `docker top $CONT` displays information from the host's point of view.
Signed-off-by: Pavel Pospisil <pospispa@gmail.com >
Upstream-commit: 1edc410e412b9c06869e508f5781cd2cdc0a14af
Component: engine
2015-12-02 18:54:52 +01:00
eeb2edd35a
fix the Dockerfile.gccgo for new dependency
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 50814a2bc0376bf144f5d235dd3662971adac14d
Component: engine
2015-12-02 16:44:07 +00:00
30eb543363
fix minor markup issues
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0f2986cee57e1854f3346ca7609740bdd51d0dcb
Component: engine
2015-12-02 17:21:06 +01:00
529645209e
Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater
...
modified note to provide a link for installation instructions on Ubuntu 15.04 or above
cleaned up typos for ubuntulinux.md
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com >
Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52
Component: engine
2015-12-02 17:21:05 +01:00
cf1f5d3461
Merge pull request #18350 from duglin/Issue9798a
...
Deprecate -f flag from docker tag
Upstream-commit: fcccf2dae4770bdb7781d57e20ae94b9565b67ac
Component: engine
2015-12-02 08:16:09 -08:00
d6f6dfdf0d
Merge pull request #18365 from estesp/clarify-error-messages
...
Differentiate integration test error messages
Upstream-commit: d9163e088e41491cfe6d49fef17b1dff149a1b0e
Component: engine
2015-12-02 08:14:53 -08:00
cd57abf420
Merge pull request #18351 from LK4D4/fix_rm_race
...
Fix race between two ContainerRm
Upstream-commit: e07769bc5a50355d972cbc71d150dc2d339f7370
Component: engine
2015-12-02 08:13:52 -08:00
26a5e0a515
update order and address review notes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 920a2618392d5235b9823b97aeb80ad858639b81
Component: engine
2015-12-02 16:38:51 +01:00
cec860f76a
add examples in search.md
...
Signed-off-by: gwx296173 <gaojing3@huawei.com >
Upstream-commit: 42d4eabeb22f98267c2294bbf7551f1fe0c13cb1
Component: engine
2015-12-02 16:38:51 +01:00
21abdff772
Differentiate integration test error messages
...
Makes it easier to debug in the future given three different docker run
executions were all outputting the same error string.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 3241b564a5c2799cac9836101b9e208b216a9ff5
Component: engine
2015-12-02 10:25:00 -05:00
b09decdc67
Merge pull request #17822 from WeiZhang555/docs-isolation
...
Add docs for option `--isolation`
Upstream-commit: 8a350c5c7b3b5934812915702d4c50b68eeead56
Component: engine
2015-12-02 16:18:15 +01:00
71b21cf347
This patch adds --tmpfs as a option for mounting tmpfs on directories
...
It will Tar up contents of child directory onto tmpfs if mounted over
This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
c529eb3ce9
Consolidate time format for API
...
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1
Component: engine
2015-12-02 22:40:18 +08:00
1e2b4815df
Add docs for option --isolation
...
Add docs for `run`/`create`/`build` command option `isolation`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 38ec5d86a355674cfddf8c998591abb098475bab
Component: engine
2015-12-02 22:24:33 +08:00
92e9c7bc6c
Merge pull request #18340 from runcom/move-defshmsize-to-daemon
...
Move defaultSHMSize in daemon pkg
Upstream-commit: db6c4c99d86aeabaae840ba0933d94587f9dc7b5
Component: engine
2015-12-02 09:18:21 -05:00
22eaa04494
Move defaultSHMSize in daemon pkg
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 2969abc6c55a9ab126b90d0af4b67860b4103f3f
Component: engine
2015-12-02 10:28:10 +01:00
e9c9b85f8b
Fix race between two ContainerRm
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 4d1007d75c24f4e9f1d8df18cb3faae53b183661
Component: engine
2015-12-01 20:13:18 -08:00
2603d9d05a
Deprecate -f flag from docker tag
...
Closes #9798
@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8d4fe141c4c3f456df9c2be75ffe5071d1665717
Component: engine
2015-12-01 19:53:49 -08:00
b52058194c
Set default MemorySwappiness when adapt
...
It makes the inspect result consistent between cli and REST api
when MemorySwappiness is not set.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 4089b4e4400d44f7c0a5b15065c70228f10ebf0c
Component: engine
2015-12-02 10:53:52 +08:00
3ffe69d3e4
Move security opt adaption to adapt function
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 1415f55cc09230e19ca3110af7174baa3f5569ba
Component: engine
2015-12-02 08:26:11 +08:00
0a4f515b90
Merge pull request #18352 from jfrazelle/update-go-md2man
...
update go-md2man because code.google.com needs to go away
Upstream-commit: e75da4b6fffbcf9dab86cd581e962a19d3efa35a
Component: engine
2015-12-01 16:04:24 -08:00
66c2c983d6
update go-md2man because code.google.com needs to go away
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 6842c906c44fefeb3ca78aae550e64341e040391
Component: engine
2015-12-01 16:02:40 -08:00
d5614b1f4a
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
Upstream-commit: da0c9286a9e82a88e75eb9298e96426978fba4bc
Component: engine
2015-12-01 17:12:00 -05:00
a68d03ab84
Merge pull request #18343 from calavera/unify_debug_logging
...
[Carry 18260] Remove info logging from every api call.
Upstream-commit: 3962fe5d7b47383b752383b48adf7e1ac0a6f202
Component: engine
2015-12-01 13:42:57 -08:00
5ed9289ac6
Merge pull request #18308 from mountkin/delete-graphdb-later
...
fix 2 corner cases in container create cleanup and container removal
Upstream-commit: 5efb37616ffd4b848578424ebb7b290af9965eff
Component: engine
2015-12-01 13:19:59 -08:00
a29b07bf59
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 359d0c247fe523ef82676f9ae4046b79e6854fe1
Component: engine
2015-12-01 13:16:42 -08:00
d583bad1ef
Unify both debug logging middlewares.
...
We can remove one function from the stack by injecting the middleware
only when logging in enabled and the level is debug.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 82323294db96e8043244027c262481af6c8f478d
Component: engine
2015-12-01 14:33:33 -05:00
51a434817c
Merge pull request #18341 from thaJeztah/fix-broken-link
...
docs: fix broken link to 1.7 Hub API
Upstream-commit: f199a4bad6aefb0fc131374abb258ed4351552b1
Component: engine
2015-12-01 09:46:45 -08:00
54b7c08e2c
fix 2 corner cases in container create cleanup and container removal
...
- avoid empty Names in container list API when fails to remove
a container
- avoid dead containers when fails to create a container
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 4953ea1eae211366c7214bfd2381a4a189d5466a
Component: engine
2015-12-02 01:37:50 +08:00
efeb394283
docs: fix broken link to 1.7 Hub API
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 09742bcd692b2594800631e5c5c16d76dcf0e9f2
Component: engine
2015-12-01 17:57:12 +01:00
eccd86ee34
Merge pull request #18321 from icecrime/maintainers_rework
...
MAINTAINERS file cleanup
Upstream-commit: c6f1feb07be5fbeb058a29dc9a9b1efff5431d50
Component: engine
2015-12-01 11:48:22 -05:00
a81f232a58
Merge pull request #18261 from runcom/fix-shm-size
...
fix shm size handling
Upstream-commit: 7b23976a83a5b2d342876118d365abb75f4bf625
Component: engine
2015-12-01 11:47:27 -05:00
db9d4c9cd6
Update core maintainers, remove duplicates
...
Move cpuguy83, duglin, tianon to core maintainers to reflect reality.
Remove james (duplicate for jamtur01) and add [people.jamtur01] section.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: bd2d53af2c6b8da6ab136298650318186cabbdf8
Component: engine
2015-12-01 07:56:19 -08:00
ec12c4920e
fix shm size handling
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: ef1d410b0270fa7309d76aded34113396def7fb2
Component: engine
2015-12-01 16:29:40 +01:00
142c1d2bdc
Merge pull request #18310 from rhvgoyal/log-fs-creation
...
devmapper: Log start and end of filesystem creation
Upstream-commit: c8891158bd1499b060346f42f52be45484a3ac94
Component: engine
2015-12-01 09:49:13 -05:00
