clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,577 Commits 9 Branches 112 Tags
dfddfa6bb8560e8a75aa67abd3b34cf82e98311c
Commit Graph
1447 Commits
Author SHA1 Message Date
John Howard dfddfa6bb8 Windows: Simple import error on config_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 12:18:55 -07:00
Alexander Morozov 27b77464d8 Merge pull request #13232 from Microsoft/10662-zfs 
Windows: No ZFS graphdriver
 2015-05-15 11:51:48 -07:00
David Calavera b785e5091f Merge pull request #13086 from shishir-a412ed/docker_root_execdriver 
root dir for execdriver (/var/run/docker) should be configurable
 2015-05-15 11:16:12 -07:00
Alexander Morozov 88127ce475 Merge pull request #13246 from unclejack/refactor_statscollector 
daemon/stats_collector: refactor getSystemCpuUsage
 2015-05-15 11:06:47 -07:00
Shishir Mahajan 8b2c6cb072 root dir for execdriver (/var/run/docker) should be configurable 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-05-15 09:30:36 -04:00
unclejack 25f776451e daemon/stats_collector: refactor getSystemCpuUsage 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-05-15 12:22:50 +03: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
John Howard 35cdcbb323 Windows: No ZFS graphdriver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-14 15:57:45 -07:00
Tibor Vass c5240d79e3 Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor 
Windows: Start of daemon config refactor
 2015-05-14 14:55:22 -07:00
John Howard 655a58e27b Windows: Factor out syslog and journald 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-14 10:34:09 -07: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
Sebastiaan van Stijn ed25742002 Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
 2015-05-13 18:30:32 -07:00
Darren Shepherd f2e5207fc9 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-13 17:56:32 -07:00
Brian Goff f2bc54f796 Merge pull request #13201 from Microsoft/10662-fixdebugtrap 
Fix package on debugtrap_unsupported.go
 2015-05-13 20:44:13 -04:00
Brian Goff feb0fa8dbf Merge pull request #13112 from hqhq/hq_fix_oonkilldisable 
Fix oom kill disable issue
 2015-05-13 20:03:33 -04:00
John Howard 1e78eec826 Fix package on debugtrap_unsupported.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-13 16:38:59 -07: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
Jessie Frazelle 37cb2a15bf Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow 
Make sure log pipes are closed
 2015-05-12 13:52:49 -07:00
Michael Crosby e0777e69cb Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter 
modprobe br_netfilter
 2015-05-12 13:46:34 -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
Jessie Frazelle b0518fe038 Merge pull request #12847 from cpuguy83/fix_firewald_errors 
Fix error message on firewalld init
 2015-05-12 12:01:59 -07:00
Jessica Frazelle 4800d4df8c this fixes hairpin nat tryinng to ping a the host and port from inside a container 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-12 11:57:36 -07: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
Alexander Morozov 445afe0977 Merge pull request #13151 from Mic92/master 
zfs: update filesystem cache on filesystem creation/deletion
 2015-05-12 10:53:01 -07:00
Brian Goff e3ba3dd5b8 Make sure log pipes are closed 
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-12 13:50:51 -04: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
John Howard b3bca3afc9 Windows: Start of daemon config refactor 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-12 09:50:32 -07:00
Sebastiaan van Stijn d0459abe6e Merge pull request #12362 from ahmetalpbalkan/logs/since 
Add --since argument to docker logs cmd
 2015-05-12 09:40:16 -04:00
Jörg Thalheim 2cb23527e4 zfs: update filesystem cache on filesystem creation/deletion 
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.

Fixes #13142

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-05-12 13:06:41 +02:00
Sebastiaan van Stijn a5007e5737 Merge pull request #10786 from estesp/add-goroutine-debug 
Add capability for goroutine dumping on SIGQUIT/USR1
 2015-05-11 21:20:44 -04:00
Phil Estes 95fcf76cc6 Add SIGUSR1 handler for dumping stack/goroutine traces 
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks.  This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-05-12 10:09:23 +10:00
Tibor Vass e7568ed227 Merge pull request #9411 from Mic92/features/zfs-rebased 
zfs-utils based zfs graph driver
 2015-05-11 16:53:17 -07:00
Jessie Frazelle a47fb5edca Merge pull request #13132 from LK4D4/fix_race_kill 
Fix race between execdriver.Kill and execdriver.Run
 2015-05-11 14:01:07 -07:00
Alexander Morozov ca7219f5da Fix race between execdriver.Kill and execdriver.Run 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-11 13:23:50 -07:00
Jessie Frazelle 8cc93856e3 Merge pull request #13074 from runcom/11824-short-link-if-equals-alias 
Allow links to be specified with only the name if it matches the alias
 2015-05-11 13:18:29 -07:00
Antonio Murdaca c6e6223ed7 Allow links to be specified with only the name if this matches the alias 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-11 21:50:47 +02: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
Alexander Morozov 5e063326a3 Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks 
Removing extra locks for Pause and Unpause functions
 2015-05-11 10:54:39 -07:00
Jessie Frazelle 92344602ea Merge pull request #13091 from LK4D4/generate_caps 
Generate caps
 2015-05-11 10:42:59 -07: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
Gianluca Borello e324f51e5b Default MAC address generation is not random and should be stated in the documentation. 
Signed-off-by: Gianluca Borello <g.borello@gmail.com>
 2015-05-10 08:11:26 -07:00
Qiang Huang a2f39e7754 Fix oom kill disable issue 
It should not be hard limit, we should only check oom kill disable
when user using it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-10 14:55:00 +08:00
Bharath Thiruveedula 8c1ef5ceaf Removing extra locks for Pause and Unpause functions 
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com>
 2015-05-10 00:16:54 +05:30
Alexander Morozov 340fd140e6 Merge pull request #12988 from Mashimiao/remove-unused-container-functions 
cleanup: remove unneeded locks
 2015-05-09 09:42:27 -07:00
Ma Shimiao bcc24ec8ad cleanup remove unneeded locks 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:06:53 +08: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
Brian Goff 38b5c7266a Fix error message on firewalld init 
If firewalld is not installed (or I suppose not running), firewalld was
producing an error in the daemon init logs, even though firewalld is not
required for iptables stuff to function.
The firewalld library code was also logging directly to logrus instead
of returning errors.

Moved logging code higher up in the stack and changed firewalld code to
return errors where appropriate.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-08 15:51:44 -04:00
Michael Crosby 3697dddc0d Merge pull request #12978 from Microsoft/10662-containerexeccreate 
Windows: Split ContainerExecCreate
 2015-05-08 11:38:03 -07:00