clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-05-17 12:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,083 Commits 9 Branches 112 Tags
ff770d33cdee5ab4dc0bdeb06dcfea49aa72ab8e
Commit Graph

883 Commits

Author SHA1 Message Date
Brian Goff
1d3f7cc012 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 74c12aa429)
 2015-06-10 10:38:33 -07:00
Antonio Murdaca
33588c23c3 Avoid nil pointer dereference while creating a container with an empty Config 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 4ce817796e)
 2015-06-08 11:39:17 -07:00
John Howard
5c408158a6 Windows: factor out bridge server+config 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit ead2f80073)
 2015-06-08 11:36:48 -07:00
Jessica Frazelle
18af7fdbba fix version struct on old versions 
Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit 229b599259)
 2015-06-03 17:33:10 -07:00
Antonio Murdaca
339f0a128a SizeRW & SizeRootFs omitted if empty in /container/json call 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 6945ac2d02)
 2015-06-03 17:33:10 -07:00
Alexander Morozov
930f691919 Support CloseNotifier for events 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 9e7fc245a7)
 2015-06-03 13:47:20 -07:00
Antonio Murdaca
bf371ab2a5 Do not omit empty json field in /containers/json api response 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
(cherry picked from commit 725f34151c)
 2015-06-03 12:43:08 -07:00
Antonio Murdaca
2939617c8b Expose old config field for api < 1.19 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
(cherry picked from commit 6deaa58ba5)
 2015-06-02 16:02:13 -07:00
Victor Vieux
ecdf1297a3 no not print empty keys in docker info 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
(cherry picked from commit c790aa36ea)
 2015-06-02 11:03:06 -07:00
Antonio Murdaca
db3daa7bdd Fix wrong kill signal parsing 
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com>
(cherry picked from commit 39eec4c25b)
 2015-06-02 09:43:43 -07:00
Lei Jitang
6ca78fff63 Add docker stats --no-stream show cpu usage 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 96123a1fd5)

Conflicts:
	daemon/stats.go
 2015-06-01 10:09:14 -07:00
Jessica Frazelle
b38c720f19 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
(cherry picked from commit b372f9f224)

Conflicts:
	docs/sources/reference/api/docker_remote_api_v1.20.md
 2015-06-01 09:31:32 -07:00
Doug Davis
ab7e7a7338 Carry #11858 
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly

Signed-off-by: Doug Davis <dug@us.ibm.com>
(cherry picked from commit 8324d7918b)
 2015-06-01 08:53:49 -07:00
Antonio Murdaca
85f0e01833 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
(cherry picked from commit ec97f41465)
 2015-05-29 15:06:01 -07:00
Alexander Morozov
d000ba05fd Treat systemd listeners as all other 
Fix #13549

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 6f9fa64645)
 2015-05-28 14:16:28 -07:00
Jason Shepherd
fb124bcad0 adding nicer help when missing arguments (#11858) 
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net>
(cherry picked from commit 48231d623f)
 2015-05-28 11:33:34 -07:00
Alexander Morozov
7b57fae046 Merge pull request #13507 from hqhq/hq_remove_redundant_set_header 
Remove redundant set header
 2015-05-27 10:44:57 -07:00
Qiang Huang
94d604357f Remove redundant set header 
Which is already done in writeJSON.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:25:57 +08:00
Qiang Huang
7c7aebfcfe Return err if we got err on parseForm 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-27 18:16:28 +08:00
Antonio Murdaca
77280a87b7 Fix race in stats cli and native driver 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-26 13:55:02 +02:00
Arnaud Porterie
bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Alexander Morozov
d71ba0cc83 Merge pull request #13372 from calavera/move_socket_creation_to_package 
Extract sockets initialization to a package.
 2015-05-22 08:46:31 -07:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Arnaud Porterie
78578125ce Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 16:27:42 -07:00
David Calavera
0bfbc6e788 Extract sockets initialization to a package. 
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-20 16:48:39 -07:00
Jessie Frazelle
19790c46dc Merge pull request #13338 from icecrime/13023_experimental_env_var 
Add DOCKER_EXPERIMENTAL environment variable
 2015-05-20 13:04:28 -07:00
Arnaud Porterie
ca6722f1c5 Add DOCKER_EXPERIMENTAL environment variable 
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-20 12:21:17 -07:00
Alexander Morozov
53a795378d Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
f12f51b8b9 Removed dead code from docker after libnetwork integration 
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:55 +00:00
Jana Radhakrishnan
d18919e304 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:19 +00:00
Doug Davis
7fcf849749 Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-19 11:21:05 -07:00
Zhang Wei
d91ae65280 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-19 10:54:04 +08:00
Brian Goff
3b69ca5b97 Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
 2015-05-18 14:36:54 -04:00
Brian Goff
692b7b911e Merge pull request #13271 from Microsoft/10662-nounixsocket 
Windows: No unix_socket.go
 2015-05-16 21:34:15 -04:00
Alexander Morozov
b5e932a3bf Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
 2015-05-16 09:05:03 -07:00
Antonio Murdaca
624bf81fdb Add RestartPolicy methods instead of using strings checking 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-16 14:15:28 +02:00
John Howard
6c187b8b4b Windows: No unix_socket.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-15 15:49:02 -07:00
Ahmet Alp Balkan
1630ed97ac Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-15 20:21:59 +00:00
Victor Vieux
b261ce5fb0 Revert "Fix inconsistent date formats in API" 
This reverts commit 945fc9d882.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-14 17:31:45 -07:00
Brian Goff
ac81cd1fc3 Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
 2015-05-14 10:36:50 -04:00
Doug Davis
1c5a4728e1 Merge pull request #13208 from ahmetalpbalkan/nit 
Remove out of date comment
 2015-05-14 06:59:21 -07:00
Doug Davis
3f4926e49b Fix a regression in docker import on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan
9448d3627b Remove out of date comment 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-14 07:37:31 +00:00
Sebastiaan van Stijn
1d57642906 Merge pull request #11706 from HuKeping/time 
Fix inconsistent date formats in API
 2015-05-13 20:23:19 -07:00
Hu Keping
945fc9d882 Fix inconsistent date formats in API 
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history

display the Created Time as UNIX format which doesn't make sense.

These should be more readable as CLI command `docker inspect` shows.

Due to the case that an older client with a newer version daemon, we
need the version check for now.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-14 18:58:55 +08:00
David Calavera
951c2ef2c9 Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring 
daemon: Logging drivers architectural refactoring
 2015-05-13 11:00:50 -07:00
Antonio Murdaca
56847ec4d4 Merge pull request #13106 from duglin/HumanizeCliErrors 
Use stderr instead of logrus for CLI error messages
 2015-05-13 05:23:56 +02:00
Jessie Frazelle
36d995a291 Merge pull request #11965 from duglin/DEBUG 
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
 2015-05-12 18:24:04 -07:00
Tibor Vass
3985f17812 Merge pull request #13131 from Microsoft/10662-loadonwindows 
Windows: Build load.go
 2015-05-12 18:04:33 -07:00
Doug Davis
0024935f64 Use stderr instead of logrus for CLI error messages 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-12 17:22:41 -07:00