8b454dd79e
Add a "context" to the api/server/* code
...
This defines a 'context' object that is passed to each API handler.
Right now the context just has a unique 'requestID' for each API call.
The next steps would be:
- use this 'requestID' in our logging.
- determine the best way to format the logging to include this info.
In particular for log events that generate multiple entries in the log
we can use the requestID to help correlate the log entries.
Adding the requestID to the logging will be a challenge since it could mean
changing every single logrus.XXX() call to pass in the 'context' object.
But first step is to agree on a format, which we can discus in a subsequent
PR, but my initial thoughts are to add it right after the timestamp:
current format:
INFO[0039] POST /v1.21/build?buildargs=%7B%22foo%22%3A%22xxx%22%7D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&memory=0&memswap=0&rm=1&t=&ulimits=null
proposed format:
INFO[0039-83dea1222191] POST /v1.21/build?buildargs=%7B%22foo%22%3A%22xxx%22%7D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&memory=0&memswap=0&rm=1&t=&ulimits=null
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-09 12:51:20 -07:00
9ca4aa4797
Merge pull request #15798 from calavera/volume_driver_host_config
...
Move VolumeDriver to HostConfig to make containers portable.
2015-09-08 22:05:40 -04:00
a58aa9d889
Merge pull request #16157 from runcom/add-missing-err-check-integration-cli-run
...
integration-cli: add missing err check
2015-09-08 17:26:10 -07:00
4b4597ae17
Merge pull request #16158 from duglin/Issue16146
...
Add --help to "docker volume inspect --help" output
2015-09-08 19:50:22 -04:00
25418010ef
Merge pull request #16113 from Mashimiao/fix-bug-daemon-delete-link-remove
...
record the error of removing volumes when removing containers
2015-09-08 19:44:56 -04:00
51662df329
Merge pull request #16123 from albers/completion-volume
...
bash completion for `docker volume`
2015-09-08 16:21:49 -07:00
634a848b8e
Merge pull request #16096 from vdemeester/14756-final-golints
...
Final bits of enabling golint on the code base 🐹
2015-09-08 15:25:55 -07:00
5c22cb5741
Merge pull request #16148 from Microsoft/10662-fixlogging
...
Windows: Fix logging
2015-09-08 14:28:28 -07:00
fd32c47112
Merge pull request #16151 from LK4D4/light_stats
...
Don't read CPU usage if there is no subscribers for stats
2015-09-08 14:26:54 -07:00
87255b6721
Add --help to "docker volume inspect --help" output
...
Closes #16146
While in there, modified the testing infrastructure for the help text
so that we can get commands with nested commands - like "volume".
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-08 14:24:00 -07:00
d5a705b600
integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-08 23:05:54 +02:00
9fdb626bfb
Merge pull request #16153 from calavera/missing_ps_placeholder
...
Add missing ps placeholder to the docs.
2015-09-08 13:42:10 -07:00
914905f452
Add missing ps placeholder to the docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-08 16:12:26 -04:00
0c70eb8381
Update validate-lint to find go files by itself
...
… and fixes the last bits that were missing :3.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-08 22:07:42 +02:00
ab197f7ad2
Merge pull request #16053 from sallyom/man-docker-tag
...
man docker-tag minor fixup
2015-09-08 21:45:27 +02:00
1d52c53eea
Windows: Fix logging
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-08 12:18:50 -07:00
1947ab6c1e
Merge pull request #15368 from jengeb/docs-docker-start
...
[docs] Add instruction to start docker on Ubuntu
2015-09-08 11:59:13 -07:00
479fcbb1d0
Merge pull request #16088 from jfrazelle/better-canonical-json-package
...
replace canonical json package
2015-09-08 11:58:24 -07:00
c486a3a6dc
Don't read CPU usage if there is no subscribers for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-09-08 11:57:22 -07:00
eb5c81e799
Merge pull request #16130 from aboch/vnd
...
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
2015-09-08 11:29:34 -07:00
451f4d0d3b
Merge pull request #16142 from cpuguy83/stats_pass_container
...
Don't lookup container 4 times for stats
2015-09-08 11:19:33 -07:00
2b6da0a965
Merge pull request #16144 from albers/fix-volume-optional
...
[Fix 16122] usage for `docker volume inspect` and `docker volume rm`
2015-09-08 11:18:43 -07:00
3fdfbd43b6
Merge pull request #16103 from HuKeping/format
...
Refactor some code to use simply format
2015-09-08 13:08:35 -04:00
00eaa7e1f5
Fix usage for `docker volume inspect` and `docker volume rm`
...
For both commands, volume is _not_ optional. Several volumes may
be specified.
Both commands now use the same name (VOLUME) for the command argument.
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-08 09:14:57 -07:00
4d648f924a
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
...
+ Fix a couple of bugs introduced by previous vendoring:
- in bitseq which prevents to use experimental overlay networking
- in docker service ls cli o/p
+ Add missing http subrouter for newly introduced sandboxes
+ Fix fragmentation issue on vxlan header addition for overlay network driver
+ Remove libnetwork test code utilities from vendoring
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-09-08 07:36:35 -07:00
3a539c6db9
Merge pull request #16098 from thaJeztah/fix-16095-reverse-dangling
...
Fix docker volume dangling filter
2015-09-08 10:17:07 -04:00
dc8a39036b
Don't lookup container 4 times for stats
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-08 10:12:46 -04:00
5f5d73d515
Merge pull request #14488 from HuKeping/fixstats
...
Fix connection block when using docker stats API
2015-09-08 10:01:11 -04:00
be7d346504
Merge pull request #16126 from calavera/remove_registry_circular_dep
...
Make RegistryConfig a typed value in the api.
2015-09-08 09:37:53 -04:00
2968558f61
Merge pull request #16128 from duglin/TypoCP
...
Typo in cp.md
2015-09-08 08:14:20 +02:00
a8d6b033e1
Merge pull request #16094 from jfrazelle/bump-sqlite3
...
Bump sqlite3
2015-09-07 22:29:49 -07:00
c045af8332
replace weird canonical json package with one that is rebased on the standard encoding/json package
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-07 18:51:33 -07:00
46df9e4ec3
update sqlite3 vendor with fix for static builds
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-07 18:50:56 -07:00
a14a31ed40
Typo in cp.md
...
Closes #16124
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-07 18:19:54 -07:00
12058f3a75
Merge pull request #16064 from pachyderm/master
...
Add link to Pachyderm PFS volume driver plugin in plugins.md
2015-09-08 10:59:57 +10:00
719886d435
Make RegistryConfig a typed value in the api.
...
Remove possible circular dependency that prevented us from using a real
type.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-07 19:29:33 -04:00
57ab4a1a6c
bash completion for `docker volume`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-07 13:22:57 -07:00
13d1f0c1a1
Merge pull request #16121 from albers/doc-volume-typo-1
...
Fix minor typo in volume create reference
2015-09-07 15:33:40 -04:00
45368779f8
Fix minor typo in docs
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-07 21:16:47 +02:00
b1053a7526
Merge pull request #16120 from josegonzalez/patch-1
...
Transform comma into period
2015-09-07 14:05:03 -04:00
be304ec688
Transform comma into period
...
This was probably meant as a separate sentence but is now
"proper english."
Signed-off-by: Jose Diaz-Gonzalez <jose@seatgeek.com>
2015-09-07 13:56:20 -04:00
c1c4ccefcd
Merge pull request #16110 from Mashimiao/daemon-create-fix-return-and-adjust
...
before adjusting should check whether need return or not
2015-09-07 09:16:23 -07:00
49da029030
record the error of removing volumes
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-07 16:38:05 +08:00
6743a6e665
Merge pull request #16111 from Mashimiao/fix-typo-daemon-daemon
...
daemon/daemon: fix typo
2015-09-07 09:31:54 +02:00
89f99343ff
daemon/daemon: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-07 14:43:22 +08:00
73d8af9319
before adjusting should check whether need return or not
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-09-07 11:09:39 +08:00
f4fb4796a1
move pachyderm PFS link above rex ray link in docs/extend/plugins.md
...
Signed-off-by: Peter Edge <peter.edge@gmail.com>
2015-09-07 00:36:14 +02:00
23b33aef1e
Add link to Pachyderm PFS volume driver plugin in plugins.md
...
Signed-off-by: Peter Edge <peter.edge@gmail.com>
2015-09-07 00:36:03 +02:00
1cbf9047b3
Fix docker volume dangling filter
...
The docker volume ls -f dangling=true filter was
inverted; the filtered results actually returned all
non-dangling volumes.
This fixes the filter and adds some integration tests
to test the correct behavior.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-09-06 20:17:56 +02:00
cd33b98041
Refactor some code to use simply format
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-06 20:59:09 +08:00
Doug Davis