Sebastiaan van Stijn
ee3e07d359
Merge pull request #18301 from wenchma/doc_update_for_net
...
Add NETWORK_NAME_or_ID value for --net= option
2015-12-02 22:36:01 +01:00
Sebastiaan van Stijn
6deec021e5
Merge pull request #18309 from WeiZhang555/time
...
Consolidate time format for API
2015-12-02 22:28:28 +01:00
Alexander Morozov
61773e5cbf
Merge pull request #18376 from jfrazelle/fix-default-shm-size
...
fix default shm size in test
2015-12-02 12:54:07 -08:00
Sebastiaan van Stijn
d410cd4751
Merge pull request #18366 from thaJeztah/carry-17293-add-examples-in-search
...
Carry 17293 add examples in search
2015-12-02 21:52:52 +01:00
Jessica Frazelle
4354b348ad
fix default shm size in test
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-02 12:43:51 -08:00
David Calavera
aa2ca5d93c
Merge pull request #18371 from sallyom/dontReturnNonError
...
don't return error if can't delete non-existing container
2015-12-02 11:59:50 -08:00
David Calavera
f8364c013d
Merge pull request #18369 from LK4D4/misleading_rm
...
daemon/delete.go: use less confusing naming of functions
2015-12-02 11:57:18 -08:00
Arnaud Porterie
8f1f53f735
Merge pull request #16277 from runcom/add-oom-score-adj
...
Add OomScoreAdj
2015-12-02 11:49:51 -08:00
moxiegirl
f4176f9169
Merge pull request #18367 from thaJeztah/zelahi-17586-systemd-documentation
...
[carry] configuring DNS options on systemd
2015-12-02 11:39:18 -08:00
Brian Goff
f411b101ac
Merge pull request #18285 from hqhq/hq_fix_swappiness
...
Set default MemorySwappiness when adapt
2015-12-02 14:25:08 -05:00
David Calavera
d4be46def4
Merge pull request #13587 from rhatdan/volume-tmpfs
...
Add tmpfs as a valid volume source command.
2015-12-02 11:16:49 -08:00
Alexander Morozov
828f63f1ab
daemon/delete.go: use less confusing naming of functions
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-12-02 11:10:14 -08:00
Sally O'Malley
bfa5027e96
don't return error if can't delete non-existing container
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-12-02 13:48:59 -05:00
David Calavera
10b30cf09c
Merge pull request #18240 from pospispa/Improvement-of-docker-top-Man-Page
...
Improvement of docker top Man Page
2015-12-02 10:29:00 -08:00
Jess Frazelle
e274db94dd
Merge pull request #18368 from brahmaroutu/gccgo_fix
...
fix the Dockerfile.gccgo for new dependency
2015-12-02 10:03:29 -08:00
Jess Frazelle
289251d088
Merge pull request #17769 from tianon/vendor-windows
...
Fix Windows support in .vendor-helpers.sh
2015-12-02 10:02:08 -08:00
Pavel Pospisil
1edc410e41
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 >
2015-12-02 18:54:52 +01:00
Srini Brahmaroutu
50814a2bc0
fix the Dockerfile.gccgo for new dependency
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-12-02 16:44:07 +00:00
Sebastiaan van Stijn
0f2986cee5
fix minor markup issues
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-02 17:21:06 +01:00
Zuhayr Elahi
0fb1845e95
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 >
2015-12-02 17:21:05 +01:00
Jess Frazelle
fcccf2dae4
Merge pull request #18350 from duglin/Issue9798a
...
Deprecate -f flag from docker tag
2015-12-02 08:16:09 -08:00
Jess Frazelle
d9163e088e
Merge pull request #18365 from estesp/clarify-error-messages
...
Differentiate integration test error messages
2015-12-02 08:14:53 -08:00
Jess Frazelle
e07769bc5a
Merge pull request #18351 from LK4D4/fix_rm_race
...
Fix race between two ContainerRm
2015-12-02 08:13:52 -08:00
Sebastiaan van Stijn
920a261839
update order and address review notes
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-02 16:38:51 +01:00
gwx296173
42d4eabeb2
add examples in search.md
...
Signed-off-by: gwx296173 <gaojing3@huawei.com >
2015-12-02 16:38:51 +01:00
Phil Estes
3241b564a5
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)
2015-12-02 10:25:00 -05:00
Sebastiaan van Stijn
8a350c5c7b
Merge pull request #17822 from WeiZhang555/docs-isolation
...
Add docs for option `--isolation`
2015-12-02 16:18:15 +01:00
Dan Walsh
b3e527dfd2
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 >
2015-12-02 10:06:59 -05:00
Wen Cheng Ma
08328cb703
Add NETWORK_NAME_or_ID value for --net= option
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2015-12-02 22:49:35 +08:00
Zhang Wei
9daca1222a
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 >
2015-12-02 22:40:18 +08:00
Zhang Wei
38ec5d86a3
Add docs for option --isolation
...
Add docs for `run`/`create`/`build` command option `isolation`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-12-02 22:24:33 +08:00
Phil Estes
db6c4c99d8
Merge pull request #18340 from runcom/move-defshmsize-to-daemon
...
Move defaultSHMSize in daemon pkg
2015-12-02 09:18:21 -05:00
Antonio Murdaca
2969abc6c5
Move defaultSHMSize in daemon pkg
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-12-02 10:28:10 +01:00
Alexander Morozov
4d1007d75c
Fix race between two ContainerRm
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-12-01 20:13:18 -08:00
Doug Davis
8d4fe141c4
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 >
2015-12-01 19:53:49 -08:00
Qiang Huang
4089b4e440
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 >
2015-12-02 10:53:52 +08:00
Qiang Huang
1415f55cc0
Move security opt adaption to adapt function
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-12-02 08:26:11 +08:00
Alexander Morozov
e75da4b6ff
Merge pull request #18352 from jfrazelle/update-go-md2man
...
update go-md2man because code.google.com needs to go away
2015-12-01 16:04:24 -08:00
Jessica Frazelle
6842c906c4
update go-md2man because code.google.com needs to go away
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-01 16:02:40 -08:00
Phil Estes
da0c9286a9
Merge pull request #18315 from jfrazelle/change-frozen-image-v2
...
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
Alexander Morozov
3962fe5d7b
Merge pull request #18343 from calavera/unify_debug_logging
...
[Carry 18260] Remove info logging from every api call.
2015-12-01 13:42:57 -08:00
Alexander Morozov
5efb37616f
Merge pull request #18308 from mountkin/delete-graphdb-later
...
fix 2 corner cases in container create cleanup and container removal
2015-12-01 13:19:59 -08:00
Jessica Frazelle
359d0c247f
update download-frozen-image.sh to v2 registry
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-12-01 13:16:42 -08:00
David Calavera
82323294db
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 >
2015-12-01 14:33:33 -05:00
moxiegirl
f199a4bad6
Merge pull request #18341 from thaJeztah/fix-broken-link
...
docs: fix broken link to 1.7 Hub API
2015-12-01 09:46:45 -08:00
Shijiang Wei
4953ea1eae
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 >
2015-12-02 01:37:50 +08:00
Sebastiaan van Stijn
09742bcd69
docs: fix broken link to 1.7 Hub API
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-12-01 17:57:12 +01:00
Phil Estes
c6f1feb07b
Merge pull request #18321 from icecrime/maintainers_rework
...
MAINTAINERS file cleanup
2015-12-01 11:48:22 -05:00
Brian Goff
7b23976a83
Merge pull request #18261 from runcom/fix-shm-size
...
fix shm size handling
2015-12-01 11:47:27 -05:00
Arnaud Porterie
bd2d53af2c
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 >
2015-12-01 07:56:19 -08:00