clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-20 23:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,181 Commits 9 Branches 112 Tags
9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Commit Graph
408 Commits
Author SHA1 Message Date
Brian Goff 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
Madhu Venugopal eb5c81e799 Merge pull request #16130 from aboch/vnd 
Vendoring libnetwork 3e31cead05cba8ec20241630d051e6d73765b3a2
 2015-09-08 11:29:34 -07:00
Alessandro Boch 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
Brian Goff 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
Hu Keping d9bf8163ad Fix connection block when using docker stats API 
For now CLI `docker stats` will not block even if the container was
not running is because there is a 2s timeout setting when waiting for
the response.

I think why we hang there waiting for the container to run is because we
want to get the stats of container immediately when it starts running.
But it will block when use the API directly, for example
- curl
- Google Chrome plugin, Postman
- Firefox plugin, RESTClient

This patch keeps the feature that getting info immediately when container
starts running and in the meantime, it will not block when using the API
directrly.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-09-06 17:21:41 +08:00
David Calavera 6549d6517b Move VolumeDriver to HostConfig to make containers portable. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-04 12:42:44 -04:00
David Calavera b5cc077864 Remove /containers/ps from the api router. 
This route was deprecated more than two years ago in the linked
commit[1]. It's not referenced anywhere in the documentation and it's
time to stop maintaning it.

[1]: https://github.com/docker/docker/commit/4f9443927e8bc8a724b43afae6cf7a183cd9acd0

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-01 05:17:35 -04:00
Josh Hawn 111d2f3487 [daemon] Refactor image_delete.go 
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-08-28 11:01:24 -07:00
Morgan Bauer abd72d4008 golint fixes for daemon/ package 
- some method names were changed to have a 'Locking' suffix, as the
 downcased versions already existed, and the existing functions simply
 had locks around the already downcased version.
 - deleting unused functions
 - package comment
 - magic numbers replaced by golang constants
 - comments all over

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-08-27 22:07:42 -07:00
Brian Goff b3b7eb2723 Add volume API/CLI 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-26 13:37:52 -04:00
David Calavera b857dadb33 Merge pull request #15711 from monitorjbl/import-commit-message 
adding message option to the import subcommand
 2015-08-26 11:42:10 +02:00
Brian Goff e134ccada7 Merge pull request #14978 from gesellix/websocket-disable-check-origin 
skip checkOrigin during websocket handshake
 2015-08-25 12:56:30 -04:00
David Calavera 6f8c4480e4 Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit 
Fix build with resource limit which system not support.
 2015-08-25 16:42:13 +02:00
Taylor Jones 936b2c6afe adding message option to the import subcommand 
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
 2015-08-25 02:55:04 +00:00
David Calavera 354a2e105d Allow HEAD requests to container archives via CORS. 
Add HEAD to Access-Control-Allow-Methods.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-08-24 05:57:22 -04:00
Shijiang Wei fcf9daad91 fix a panic when the exec fails to start 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-08-22 00:01:44 +08:00
Lei Jitang 770daa15f3 Fix build with resource limit which system is not support. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-08-18 11:54:00 +08:00
Brian Goff 5ffcecf130 Fix issue with exec TTY caused by 15446 
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-14 14:55:26 -07:00
Jessie Frazelle d3198fa8c4 Merge pull request #15446 from cpuguy83/better_err_on_exec_err 
Return better errors from exec
 2015-08-12 11:13:29 -07:00
Mrunal Patel d626f77e36 Fix incorrect comment 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-08-11 19:45:23 -04:00
Tobias Gesellchen 9bde19e72a skip checkOrigin during websocket handshake 
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
 2015-08-12 00:05:59 +02:00
Tonis Tiigi 6e3740450d Mark network ui endpoints unix-only 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-08-10 21:49:27 -07:00
Brian Goff f078f75bf2 Return better errors from exec 
Also cleans up some of the API side of exec.
Was writing the header twice (two different headers).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-10 09:53:19 -04:00
Veres Lajos 5146232723 typofix - https://github.com/vlajos/misspell_fixer 
Signed-off-by: Veres Lajos <vlajos@gmail.com>
 2015-08-07 23:25:49 +01:00
Zhang Wei 3d6617ffe7 fix golint warnings/errors on package api/types/ 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-08-07 09:43:43 +08:00
John Howard 2a237615c0 Windows - make docker cp functional 
Signed-off-by: John Howard <jhoward@microsoft.com>

Conflicts:
	pkg/archive/copy.go

Make it compile

Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-08-06 11:22:38 -07:00
Antonio Murdaca 931645c460 Remove pkg/systemd 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-08-06 14:35:00 +02:00
Qiang Huang e0af23dc18 Cleanup: Merge adjustCPUShares to adoptContainerSettings 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-06 08:15:14 +08:00
Brian Goff 1a77580030 Split API handlers into domain specific files 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-03 11:12:44 -04:00
David Calavera 8f2dca5386 Merge pull request #15144 from aaronlehmann/graph-cleanup 
Documentation improvements and code cleanups for graph package
 2015-07-31 15:11:34 -07:00
Aaron Lehmann d4836cd7ec Documentation improvements and code cleanups for graph package 
Expand the godoc documentation for the graph package.

Centralize DefaultTag in the graphs/tag package instead of defining it
twice.

Remove some unnecessary "config" structs that are only used to pass
a few parameters to a function.

Simplify the GetParentsSize function - there's no reason for it to take
an accumulator argument.

Unexport some functions that aren't needed outside the package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2015-07-30 14:27:10 -07:00
John Howard b43dc0d93c Windows: Daemon build is broken 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-29 20:08:51 -07:00
Arnaud Porterie 4a71323ec3 Merge pull request #15098 from calavera/backwards_compat_kill_error 
Keep backwards compatibility in kill api.
 2015-07-29 16:42:36 -07:00
Alexey Guskov 26c03d561a make docker compile on freebsd 
Signed-off-by: Alexey Guskov <lexag@mail.ru>
 2015-07-29 21:25:56 +03:00
root 351f6b8ec0 api/server fix golint errors/warnings. 
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-07-28 22:44:39 +00:00
David Calavera 621e3d8587 Keep backwards compatibility in kill api. 
Return an error when the container is stopped only in api versions
equal or greater than 1.20 (docker 1.8).

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-28 12:25:36 -07:00
John Howard 47c56e4353 Windows: Factoring out unused fields 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-07-27 17:44:18 -07:00
Jessie Frazelle 25c42cc0d0 Merge pull request #14759 from vdemeester/pkg-golint 
golint on some pkg/* packages
 2015-07-27 15:19:46 -07:00
Vincent Demeester 18c7c67308 Lint on pkg/* packages 
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-27 21:26:21 +02:00
Vincent Demeester 5170a2c096 Lint fixes on runconfig 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-27 21:23:15 +02:00
Stephen Rust c358a4cd35 Check for nil before using HostConfig to adjustCpuShares 
Fix #14915. Add unit test for #14915.
Thanks @runcom for the test case: when the client calls 1.18 api
version w/o hostconfig it results in a nil pointer dereference.

Signed-off-by: Stephen Rust <srust@blockbridge.com>
 2015-07-26 20:33:04 -04:00
Lei 877dbbbde8 Add ulimit to docker build. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-23 10:26:06 +08:00
Alexander Morozov 3ee7297b7e Merge pull request #14869 from calavera/remove_duplicated_cp_handlers_init 
Remove duplicated code parsing parameters for the archiving handlers.
 2015-07-22 13:25:34 -07:00
David Calavera 1612ff9726 Remove duplicated code parsing parameters for the archiving handlers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-22 12:39:46 -07:00
David Calavera 1c6fe58efc Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader 
Refactor log driver reader
 2015-07-22 11:54:35 -07:00
Alexander Morozov a751c0a52f Merge pull request #14790 from hqhq/hq_golint_build 
Fix golint warnings for builder
 2015-07-22 08:17:04 -07:00
Antonio Murdaca 1a5d6a94c9 Fix wrong Content-Type returned by /images/search API 
/images/search was replying with Content-Type text/plain instead
of application/json.
Fix #14846

Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-22 11:07:41 +02:00
Sebastiaan van Stijn 50d2597e49 Merge pull request #13711 from calavera/version_volumes_inspect 
Expose new mount points structs in inspect.
 2015-07-22 09:02:00 +02:00
Qiang Huang 8c4a282a57 Fix golint warnings for builder 
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-22 13:29:03 +08:00
Brian Goff c0391bf554 Split reader interface from logger interface 
Implement new reader interface on jsonfile.
Moves jsonlog decoding from daemon to jsonfile logger.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-21 20:47:31 -04:00