clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-01 11:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,645 Commits 9 Branches 112 Tags
8db09ff6290fb2d4aea121c2850940b9bc480ce9
Commit Graph
1462 Commits
Author SHA1 Message Date
John Howard 8db09ff629 Windows: Empty Windows Exec Driver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-20 08:54:04 -07:00
Jessie Frazelle d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
 2015-05-20 03:11:58 +02: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
Arnaud Porterie 0cc5da0635 Merge pull request #12884 from Microsoft/10662-startcontainerrefactor 
Windows: Refactor container
 2015-05-19 10:44:23 -07:00
Alexander Morozov 3916561619 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 09:32:23 -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
Michael Crosby 70e9e4bf9f Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
 2015-05-18 11:35:01 -07:00
Ahmet Alp Balkan 8b11592d69 Pass -log-opts map to logdrivers 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-05-18 16:50:14 +00:00
Brian Goff 19ae59f910 Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver 
Windows: NewDriver() re-baseline parms
 2015-05-18 10:56:06 -04:00
John Howard b9e4b95788 Windows: Refactor container 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 12:38:20 -07:00
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
John Howard 50b4079b5f Windows: NewDriver() re-baseline parms 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-16 11:38:19 -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
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
Lei Jitang 0204ecdf70 Fix incorrect document storage-opt 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-15 19:13:07 +08: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