Commit Graph

  • 3c6aacdcbb Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm Sven Dowideit 2014-03-25 11:21:06 +10:00
  • 6bdc8cd953 Merge pull request #4751 from enokd/master Michael Crosby 2014-03-24 17:43:02 -07:00
  • f6d78803bd Promote btrfs Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 68dd722e3c54995e609b2524bad501ab1d4d15d6 Component: engine Michael Crosby 2014-03-24 14:15:04 +00:00
  • 8832e97391 Merge pull request #4837 from crosbymichael/remove-ci Tianon Gravi 2014-03-24 18:01:26 -06:00
  • 186280f667 Merge pull request #4778 from vbatts/vbatts-save_to_output Michael Crosby 2014-03-24 16:52:08 -07:00
  • 665275b36f Merge pull request #4835 from crosbymichael/reverst-stop-kill Guillaume J. Charmes 2014-03-24 16:33:38 -07:00
  • ac424b1fd8 Merge pull request #4832 from LK4D4/fix_events_hanging_#4804 Michael Crosby 2014-03-24 16:26:50 -07:00
  • ec5934f5dd Workaround for hanging events. Fixes #4804 LK4D4 2014-03-24 22:31:05 +04:00
  • aa4d9df883 As far as I know this code is not used or maintained Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: f41135bc11b9a4da896e5054a73afa112b2e835f Component: engine Michael Crosby 2014-03-24 12:39:56 +00:00
  • aa948163e7 Revert "Disable automatic killing of containers when docker stop fails" Michael Crosby 2014-03-24 12:03:56 +00:00
  • a7b2642223 Revert "fix failing test to use kill instead of stop" Michael Crosby 2014-03-24 12:03:41 +00:00
  • fa8143af81 Add unit test for lxc conf merge and native opts Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 10fdbc0467d1be6c7c731d3f35590d87ee42f96f Component: engine Michael Crosby 2014-03-24 07:16:40 +00:00
  • 9d6d07c6ea Add cpuset.cpus to cgroups and native driver options Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 9a7be1b015a1ba79e5480d0ddddfa5954b994507 Component: engine Michael Crosby 2014-03-21 14:53:47 +00:00
  • 90b90efe51 Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714 Michael Crosby 2014-03-21 17:08:06 -07:00
  • 08c755a87a Merge pull request #4800 from vieux/rename_network_driver Victor Vieux 2014-03-21 16:52:40 -07:00
  • f79fdc8091 Merge pull request #4761 from ichik1/fix-display-of-since-time-exit Michael Crosby 2014-03-21 16:48:30 -07:00
  • 90b35c5f04 Add mention of mounting cgroupfs properly to PACKAGERS.md Tianon Gravi 2014-03-12 01:58:53 -06:00
  • 9fad5483e0 Change placement of readonly filesystem Michael Crosby 2014-03-21 14:17:17 +00:00
  • 2c4bdb6828 Add more native driver options Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 83618c2b81c561cd77fd70eca90b2b251f61fcc1 Component: engine Michael Crosby 2014-03-21 14:07:16 +00:00
  • 74929e5ece Change syntax to use dots Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 146a212f71fe129f9d349c5c3e80ba4197e35850 Component: engine Michael Crosby 2014-03-21 12:38:50 +00:00
  • e56e4f3bca Change flag to -o and --opt Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: c9d7f858fd1c6e2d1287e28ee12952333b327c75 Component: engine Michael Crosby 2014-03-21 11:53:15 +00:00
  • fd04e06648 Factor out the native driver config options Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 7c726669cbcc0cfde12c6a9f03974bb672839271 Component: engine Michael Crosby 2014-03-21 08:10:07 +00:00
  • 8e8f727f50 Fix since time exit display when s.FinishedAt is zero Ken ICHIKAWA 2014-03-19 12:05:54 +09:00
  • d8e651280a Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org Victor Vieux 2014-03-20 23:07:08 -07:00
  • 3d953ff4c8 Merge pull request #4803 from alambike/patch-1 Sven Dowideit 2014-03-21 12:49:51 +10:00
  • abc3562e62 Added Eixo::Docker to the list of libraries alambike 2014-03-21 03:13:06 +01:00
  • 66a0a60a2a Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs Sven Dowideit 2014-03-21 11:18:21 +10:00
  • ffa18d8ad0 Allow containers to join the net namespace of other conatiners Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: be5538d8a8820ac1192c7a5660e0d950927b42d0 Component: engine Michael Crosby 2014-03-21 00:48:17 +00:00
  • b80ed35d06 Merge branch 'proppy-nsinit' into pluginflag Michael Crosby 2014-03-21 00:36:23 +00:00
  • b5daa68238 Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit Michael Crosby 2014-03-21 00:36:09 +00:00
  • c42d40863c Add ability to work with individual namespaces Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 70f3b9f4ce67ee54ec226814cdd26db01f69378d Component: engine Michael Crosby 2014-03-21 00:23:34 +00:00
  • 44fe86670a Allow caps to be toggled in native driver with plugin flag Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 443a75d5f66e986e9d7740d3f2aaef080aef8ea0 Component: engine Michael Crosby 2014-03-21 00:10:24 +00:00
  • 6ed3664799 Harmonize / across all name-related commands/Validate images names Djibril Koné 2014-03-21 00:40:58 +01:00
  • 3490f03690 Dont use custom marshaling for caps and namespaces Michael Crosby 2014-03-20 23:09:01 +00:00
  • 40c5419c0f Add initial plugin flag to pass lxc and native driver options Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: f7b3e879fc3047ed93ac6b43cd9bf47a25f3d0fc Component: engine Michael Crosby 2014-03-20 22:58:02 +00:00
  • 2352431354 rename lxc to bridge Victor Vieux 2014-03-20 21:51:28 +00:00
  • aae2fd84d8 Remove the inotifywait hack from our upstart host-integration example that is no longer necessary Tianon Gravi 2014-03-20 14:59:40 -06:00
  • 0164d2be10 Fix double single dash arg issues in docs Brian Goff 2014-03-20 13:09:34 -04:00
  • ca4686cb04 devicemapper: Better/faster shutdown Alexander Larsson 2014-03-20 17:32:59 +01:00
  • c2f15d709c Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm Guillaume J. Charmes 2014-03-20 09:10:32 -07:00
  • dbde2deea4 Merge pull request #4790 from tianon/fix-release Tianon Gravi 2014-03-19 22:49:19 -06:00
  • d4638ba0e0 Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too) Tianon Gravi 2014-03-19 19:58:39 -06:00
  • 5c73b528de Merge pull request #4788 from SvenDowideit/sign-releases-fixup Tianon Gravi 2014-03-19 18:19:25 -06:00
  • 0f7c241763 missed a bug Sven Dowideit 2014-03-20 10:18:08 +10:00
  • 17b4dbb455 I'm not looking forward to documenting cli arguments that may or may not show depending on what plugins / drviers you choose Sven Dowideit 2014-03-20 09:59:54 +10:00
  • 694ecbc3a5 Harmonize / across all name-related commands Djibril Koné 2014-03-18 21:18:36 +01:00
  • a1f1abe495 Merge pull request #4708 from SvenDowideit/sign-releases Tianon Gravi 2014-03-19 17:38:07 -06:00
  • 04a08a7053 whitespace-blind Sven Dowideit 2014-03-20 09:35:58 +10:00
  • 08db157788 Merge pull request #4784 from SvenDowideit/reference-security-doc James Turnbull 2014-03-19 17:20:44 -06:00
  • 1cf0c29be4 Generate md5 and sha265 hashes when building, and upload them in hack/release.sh Sven Dowideit 2014-03-16 21:10:59 +00:00
  • 5afb3d1803 add a link to the security documentation when we mention the docker group (or -G) Sven Dowideit 2014-03-20 09:08:52 +10:00
  • 43102e0522 Merge branch 'master' into discordianfish-https_client Victor Vieux 2014-03-19 22:05:36 +00:00
  • d6e39e4b66 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client Victor Vieux 2014-03-19 22:03:11 +00:00
  • 46fae9d52b Merge pull request #4703 from netroy/patch-1 Sven Dowideit 2014-03-20 07:55:35 +10:00
  • 884fb2e9f1 Merge pull request #3774 from danielnorberg/dns-search-domains Guillaume J. Charmes 2014-03-19 14:52:49 -07:00
  • f7bce0a8cc fix failing test to use kill instead of stop unclejack 2014-03-19 23:23:45 +02:00
  • 9fba82f5c1 api/client: var style tweak Vincent Batts 2014-03-19 17:09:12 -04:00
  • be30df7e0d variable declaration cleanup Daniel Norberg 2014-03-19 16:00:46 -04:00
  • 57f5eae470 fix typo in documentation Daniel Norberg 2014-03-19 15:20:36 -04:00
  • e64feaf637 Remove duplication of Dns in config merging. LK4D4 2014-03-19 21:01:20 +04:00
  • 3dcf98a6e1 Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance Michael Crosby 2014-03-19 12:07:11 -07:00
  • 2a0a13fcc3 docker save: add and improve docs Vincent Batts 2014-03-19 14:47:20 -04:00
  • 9788027867 images: assurance and debug info on image layers Vincent Batts 2014-03-19 14:34:12 -04:00
  • 02cf69562f docker save: --output flag Vincent Batts 2014-03-19 14:30:13 -04:00
  • 1ac2035314 Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy) Aditya 2014-03-16 21:35:01 +01:00
  • b5c2e757ec Merge pull request #4691 from tianon/relative-workdir Michael Crosby 2014-03-19 09:57:23 -07:00
  • c037f13ab8 configurable dns search domains Daniel Norberg 2014-02-07 11:48:14 -05:00
  • 6aee2c6f6c Merge pull request #4754 from vojnovski/consistent_apt-key_use James Turnbull 2014-03-19 07:38:05 -06:00
  • 0ff768e136 refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740 Viktor Vojnovski 2014-03-19 00:00:48 +01:00
  • bc7b9146dc Merge pull request #4727 from andreaturli/master James Turnbull 2014-03-19 01:04:44 -06:00
  • ee88186110 mention the tgz - other people might like to know Sven Dowideit 2014-03-19 14:24:49 +10:00
  • dc7241d69b use this horrible complex bit of shell to make sure that curl doesn't hand the poor user a broken docker client Sven Dowideit 2014-03-19 14:12:47 +10:00
  • a6d7cc047e Merge pull request #4758 from crosbymichael/redis-bind Sven Dowideit 2014-03-19 13:04:02 +10:00
  • e5eae6a723 Merge pull request #4753 from vieux/clean_container_stop Michael Crosby 2014-03-18 18:49:51 -07:00
  • 6a56789e29 Be explicit about binding to all interfaces in redis example Michael Crosby 2014-03-18 17:24:06 -07:00
  • 0dd8fa46f2 Merge pull request #4757 from crosbymichael/osx-duh Sven Dowideit 2014-03-19 10:22:30 +10:00
  • 4caf655f4f Add sudo clause if your using osx or tcp Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael) Upstream-commit: 38a3fc3e0e9b56400b2c7d2fce3bfc7b15395d14 Component: engine Michael Crosby 2014-03-18 17:07:45 -07:00
  • 9d78f7e8ee cleanup container.stop Victor Vieux 2014-03-18 23:12:39 +00:00
  • 12ddd522ae Merge pull request #4755 from crosbymichael/add-size-to-history-docs Sven Dowideit 2014-03-19 09:32:35 +10:00
  • 433a941c61 libcontainer: remove duplicate imports Johan Euphrosine 2014-03-18 16:25:26 -07:00
  • 2374c7e198 Add image size to history docs Michael Crosby 2014-03-18 16:24:45 -07:00
  • bf68195445 libcontainer: goimports Johan Euphrosine 2014-03-03 21:47:03 -08:00
  • 05b01b0f64 libcontainer/nsinit/init: move mount namespace after network Johan Euphrosine 2014-03-03 21:46:49 -08:00
  • c37f607a5b libcontainer/network: add netns strategy Johan Euphrosine 2014-03-03 14:41:38 -08:00
  • c9b7a0a568 Merge pull request #4744 from LK4D4/fix_issue_#3565 Michael Crosby 2014-03-18 15:39:56 -07:00
  • f8d8a57e3d Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart Tianon Gravi 2014-03-18 15:30:30 -06:00
  • 7d90dd284a Merge pull request #4740 from vojnovski/patch-1 Sven Dowideit 2014-03-19 06:48:57 +10:00
  • 463aedf3de Add upstart nofile/noproc similar to systemd init Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83) Upstream-commit: e27c635c06dcad61ce7185d95debef9ef7c9f7e0 Component: engine Brian Goff 2014-03-18 16:26:21 -04:00
  • 5ac53676ce Using names in docker ps --since-id/--before-id, resolves #3565 LK4D4 2014-03-18 21:38:56 +04:00
  • 9f3a8a726d Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop Guillaume J. Charmes 2014-03-18 11:28:42 -07:00
  • 4879ef6f17 Merge pull request #4733 from vieux/3729_time_exit Michael Crosby 2014-03-18 11:25:11 -07:00
  • eff77e2a3c Merge pull request #4650 from vbatts/vbatts-btrfs_build_tags Victor Vieux 2014-03-18 11:10:00 -07:00
  • e8fa51d05e typo Vincent Batts 2014-03-14 04:19:05 +00:00
  • 7a2dc6bc24 packagers: btrfs build tag docs Vincent Batts 2014-03-13 17:39:25 -04:00
  • 856d46eee0 btrfs: build tags Vincent Batts 2014-03-13 17:38:54 -04:00
  • cdf7c6a1a7 btrfs: build tags Vincent Batts 2014-03-13 15:10:35 -04:00
  • 7976f94412 Add err checks for port allocator tests Andy Kipp 2014-03-18 13:29:24 -04:00
  • 0ed607c3a6 Be more explicit in finding next port to allocate Andy Kipp 2014-03-13 13:30:07 -04:00
  • 9ecda2cf3a Better test error message Andy Kipp 2014-03-12 17:26:17 -04:00
  • dc2e6deab9 Prevent dynamic allocation of previously allocated ports Andy Kipp 2014-03-12 17:22:57 -04:00