clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-28 00:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,650 Commits 9 Branches 112 Tags
53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Commit Graph
856 Commits
Author SHA1 Message Date
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
Antonio Murdaca 6b700bdaca Refactor pkg/stremformatter with custom constructors instead of passing a boolean 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-13 00:09:41 +02:00
John Howard aed8f9f76e Windows: Build load.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-12 14:26:57 -07:00
Michael Crosby cb53a628b0 Merge pull request #13136 from Microsoft/10662-factoroutresolveconf 
Windows: Don't pull in all of resolvconf
 2015-05-12 13:49:47 -07:00
Alexander Morozov f35038dfba Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12 
Remove API codepaths < 1.12
 2015-05-12 13:08:36 -07:00
Ahmet Alp Balkan 3a8728b431 daemon: Logging drivers refactoring 
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
  (easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
  existing behavior)

Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-12 19:11:52 +00:00
Antonio Murdaca 7284b08204 Remove API codepaths < 1.12 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-12 20:09:49 +02:00
Jessie Frazelle d4eba30065 Merge pull request #13141 from vieux/fallback_inspect 
fallback to interface with docker inspect
 2015-05-12 11:02:06 -07:00
Alexander Morozov 3b13e56fd7 Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup 
Refactor server to use the daemon as a service
 2015-05-12 10:27:43 -07:00
Victor Vieux 52c3bb6a0e fallback to interface with docker inspect 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-05-11 17:39:21 -07:00
John Howard 78604a9f3f Windows: Don't pull in all of resolvconf 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-11 15:28:08 -07:00
Antonio Murdaca e2acca67c8 Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-11 19:56:41 +02:00
Ahmet Alp Balkan cb9a6b9aed Add --since argument to docker logs cmd 
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.

Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-10 20:42:14 +00:00
Alexander Morozov c5710c7318 Merge pull request #13093 from tianon/writeflusher 
Move WriteFlusher out of utils into ioutils
 2015-05-09 09:39:17 -07:00
Ma Shimiao dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
Tianon Gravi 223d6de728 Move WriteFlusher out of utils into ioutils 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-08 12:33:33 -06:00
Jessie Frazelle 372977148d Merge pull request #12961 from hqhq/hq_remove_err_out 
a few cleanups for client output
 2015-05-07 16:51:56 -07:00
David Calavera 404412282d Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt 
Fix error prompt for pull & import handler postImagesCreate.
 2015-05-07 16:27:15 -07:00
Bharath Thiruveedula 94def48878 Removing the SetDaemon method 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
 2015-05-07 22:25:13 +05:30
David Calavera d78755d159 Merge pull request #12822 from brahmaroutu/container_stop_api 
restapi stop fails if ?t=int not present
 2015-05-07 09:38:59 -07:00
Srini Brahmaroutu 68e9c07850 Restapi for stop fails if ?t=int not present 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-05-07 15:43:50 +00:00
Antonio Murdaca 74121a4211 Do not check and return strconv.Atoi error in api container restart, regression 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-07 01:49:16 +02:00
Arnaud Porterie e960e4bb12 Merge pull request #11844 from jbarbier/cgroup-parent-42 
Adding cgroup-parent option for docker build
 2015-05-05 14:46:47 -07:00
Qiang Huang 5a6db4fd44 a few cleanups for client output 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-05 15:59:17 +08:00
Adria Casas a2c76912e0 Rename int64Value to int64ValueOrZero. 
Signed-off-by: Adria Casas <adriacasas88@gmail.com>
 2015-05-05 08:54:28 +02:00
Tibor Vass 91fb4d672a Merge pull request #10766 from cpuguy83/stats_pull_once 
Allow pulling stats once and disconnecting.
 2015-05-04 22:28:01 -07:00
Phil Estes 3fcf387d52 Merge pull request #12718 from Microsoft/10662-mkdirall 
Windows: Volume path aware mkdirall
 2015-05-04 15:51:56 -04:00
Phil Estes 4895a887e2 Merge pull request #12937 from runcom/daemon-as-a-service 
Refactor server to use daemon as the service layer in controllers
 2015-05-04 13:03:28 -04:00