aa948163e7
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
2014-03-24 12:03:56 +00:00
a7b2642223
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
2014-03-24 12:03:41 +00:00
90b90efe51
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
...
Remove duplication of Dns in config merging.
Upstream-commit: 5294bf7e67a67b2f0643c61fb126814d82a1979d
Component: engine
2014-03-21 17:08:06 -07:00
08c755a87a
Merge pull request #4800 from vieux/rename_network_driver
...
rename lxc to bridge
Upstream-commit: 97e5295f437bbb9eae26c99842b269aae1b427c2
Component: engine
2014-03-21 16:52:40 -07:00
f79fdc8091
Merge pull request #4761 from ichik1/fix-display-of-since-time-exit
...
Fix since time exit display when s.FinishedAt is zero
Upstream-commit: de450b23bea244747953229c2ba43ca4a78c7368
Component: engine
2014-03-21 16:48:30 -07:00
8e8f727f50
Fix since time exit display when s.FinishedAt is zero
...
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: 4002eac8b8b4007de03e78dbd57232fac583d05b
Component: engine
2014-03-21 15:28:02 +09:00
d8e651280a
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
Upstream-commit: 69db8065426f6db4d27a08324b2a729f383f05eb
Component: engine
2014-03-20 23:07:08 -07:00
3d953ff4c8
Merge pull request #4803 from alambike/patch-1
...
Added Eixo::Docker to the list of libraries
Upstream-commit: 14502f0f1cea7ccb7433374484e90efb5551187d
Component: engine
2014-03-21 12:49:51 +10:00
abc3562e62
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com > (github: alambike)
Upstream-commit: 79c11b19ecd506bd76db391b896cec0d4263183d
Component: engine
2014-03-21 03:13:06 +01:00
66a0a60a2a
Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs
...
Fix double single dash arg issues in docs
Upstream-commit: 8329cd55e138fb4c1d18675e2a1c7d8afde61c84
Component: engine
2014-03-21 11:18:21 +10:00
2352431354
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 8944fb2e9b07d5a764f8d48065b9afd73364f640
Component: engine
2014-03-20 21:51:28 +00:00
0164d2be10
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: fbd6fee4ab9b98f477f365307a641b879badd282
Component: engine
2014-03-20 14:14:54 -04:00
c2f15d709c
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
Upstream-commit: 56c156190ad61765086f30367d3c362a7673ad5c
Component: engine
2014-03-20 09:10:32 -07:00
dbde2deea4
Merge pull request #4790 from tianon/fix-release
...
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
Upstream-commit: 2678af4ea8576816c5635f9c8e0d927f8faf4de1
Component: engine
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)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6b46a09186b6a53959d567014b8d0e1cff761bc8
Component: engine
2014-03-19 22:25:09 -06:00
5c73b528de
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
Upstream-commit: 372b7282cbbd09383ae0844eed9d09161dc20b42
Component: engine
2014-03-19 18:19:25 -06:00
0f7c241763
missed a bug
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 62eb23aed50c9c820836c4b3f515cba2660b5c20
Component: engine
2014-03-20 10:18:08 +10:00
a1f1abe495
Merge pull request #4708 from SvenDowideit/sign-releases
...
Add md5 and sha256 to binaries on get.docker.io
Upstream-commit: 43124b5613d74ed832ed9f9684506e10ae1c7d98
Component: engine
2014-03-19 17:38:07 -06:00
04a08a7053
whitespace-blind
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 43febdd432eb8e7dc5988c72710b3d78a5913360
Component: engine
2014-03-20 09:35:58 +10:00
08db157788
Merge pull request #4784 from SvenDowideit/reference-security-doc
...
add a link to the security documentation when we mention the docker group (or -G)
Upstream-commit: f2b01f5fa1fbb54d2dd78e323b936834635a06c0
Component: engine
2014-03-19 17:20:44 -06:00
1cf0c29be4
Generate md5 and sha265 hashes when building, and upload them in hack/release.sh
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 179e2c92d8d02d029d8aa54d53edb82b3fbcea2b
Component: engine
2014-03-20 09:19:47 +10:00
5afb3d1803
add a link to the security documentation when we mention the docker group (or -G)
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: f3765f96cfb37f6ea9f925f0d3174fe18c4152be
Component: engine
2014-03-20 09:08:52 +10:00
43102e0522
Merge branch 'master' into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: aa63ece2ec8bae9d13c258ad8e771e3a000cc941
Component: engine
2014-03-19 22:05:36 +00:00
d6e39e4b66
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
46fae9d52b
Merge pull request #4703 from netroy/patch-1
...
Document the missing `DisableNetwork` config flag to /containers/create end-point
Upstream-commit: 16ee4958f2d72e302350e659e2435cd31d8a28e5
Component: engine
2014-03-20 07:55:35 +10:00
884fb2e9f1
Merge pull request #3774 from danielnorberg/dns-search-domains
...
configurable dns search domains
Upstream-commit: 3c9ae2b3483bf89de4245884ff5e463dc35818f4
Component: engine
2014-03-19 14:52:49 -07:00
f7bce0a8cc
fix failing test to use kill instead of stop
...
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
2014-03-19 23:23:45 +02:00
be30df7e0d
variable declaration cleanup
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: c657603c612650117b4def976ff40d98ba7c3a21
Component: engine
2014-03-19 16:44:11 -04:00
57f5eae470
fix typo in documentation
...
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: 698ca9f38d7ccee2c36b98821c74114b95db631b
Component: engine
2014-03-19 16:44:09 -04:00
e64feaf637
Remove duplication of Dns in config merging.
...
Fixes #4714
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: 48cb2f03177732823b4091fd3ddd44b2bef2c58e
Component: engine
2014-03-19 23:20:30 +04:00
3dcf98a6e1
Merge pull request #4777 from vbatts/vbatts-server-info_and_assurance
...
images: assurance and debug info on image layers
Upstream-commit: 6b5ba1b06621ead46deb0e1ef52608e5e4724690
Component: engine
2014-03-19 12:07:11 -07:00
9788027867
images: assurance and debug info on image layers
...
when pushing or saving layers, report sizes for validation. And ensure
that the files written are sync'ed.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 367a679b9270dd9ec6bd647998b6ffe594cfa6ab
Component: engine
2014-03-19 14:34:12 -04:00
1ac2035314
Docker-DCO-1.1-Signed-off-by: Aditya <aditya@netroy.in> (github: netroy)
...
document `DisableNetwork` config flag
Upstream-commit: ec3257921da9da0d37df76e26a842f8f4775def0
Component: engine
2014-03-19 19:01:49 +01:00
b5c2e757ec
Merge pull request #4691 from tianon/relative-workdir
...
Add proper support for relative WORKDIR instructions
Upstream-commit: 47470d299da4ade08bad4338c4dba4ceffacdce7
Component: engine
2014-03-19 09:57:23 -07:00
c037f13ab8
configurable dns search domains
...
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com > (github: danielnorberg)
Upstream-commit: fbfac21ed4de550ce72d993810dc07a2c4877a88
Component: engine
2014-03-19 10:49:25 -04:00
6aee2c6f6c
Merge pull request #4754 from vojnovski/consistent_apt-key_use
...
refactor($hack,$docs): be consistent in apt-key keyserver URI usage
Upstream-commit: d3c5891486a263d96db5b1f8e0f0e0f698ad168d
Component: engine
2014-03-19 07:38:05 -06:00
0ff768e136
refactor($hack,$docs): be consistent in apt-key keyserver URI usage, as done in #4740
...
In #4740 , the apt-key call in docs is changed to use the keyserver port 80 instead of
port 11371, as the previous call would fail with a restrictive firewall or proxy.
This commit extends the change to all apt-key calls in the repository.
Docker-DCO-1.1-Signed-off-by: Viktor Vojnovski <vojnovski@gmail.com > (github: vojnovski)
Upstream-commit: 4fd82db4beba03a126dfc557c86d5d52e9066dae
Component: engine
2014-03-19 10:20:10 +01:00
bc7b9146dc
Merge pull request #4727 from andreaturli/master
...
add softlayer installation instructions
Upstream-commit: ccddb33bf493a1a6504c83b60812db4da3b130ff
Component: engine
2014-03-19 01:04:44 -06:00
a6d7cc047e
Merge pull request #4758 from crosbymichael/redis-bind
...
Be explicit about binding to all interfaces in redis example
Upstream-commit: 9bbc11b2aeb0652cf44f0bc583430b37356bef7c
Component: engine
2014-03-19 13:04:02 +10:00
e5eae6a723
Merge pull request #4753 from vieux/clean_container_stop
...
cleanup container.stop
Upstream-commit: 0bb1e3d9a708d8b60e2efe3888fe9edef0574ac5
Component: engine
2014-03-18 18:49:51 -07:00
6a56789e29
Be explicit about binding to all interfaces in redis example
...
Fixes #4021
Moved to debian because the redis installed in ubuntu is really old
and does not support args via the cli.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 7822b053cbd2288b6c8d9c51a8f495368bc77f35
Component: engine
2014-03-18 17:24:06 -07:00
0dd8fa46f2
Merge pull request #4757 from crosbymichael/osx-duh
...
Add sudo clause if your using osx or tcp
Upstream-commit: 3b5b2f8953387077e4dabe53936bc5867e145ea0
Component: engine
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
2014-03-18 17:07:45 -07:00
9d78f7e8ee
cleanup container.stop
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 3b1d590269466217ddf203edcef295f6cec9fcee
Component: engine
2014-03-18 23:48:14 +00:00
12ddd522ae
Merge pull request #4755 from crosbymichael/add-size-to-history-docs
...
Add image size to history docs
Upstream-commit: 9e1306f78f3d3856126955c1945a32eaf190d705
Component: engine
2014-03-19 09:32:35 +10:00
2374c7e198
Add image size to history docs
...
Fixes #3147
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 041ae08a2c8f6f345ac0d7f5fea4b79655e28dc5
Component: engine
2014-03-18 16:24:45 -07:00
c9b7a0a568
Merge pull request #4744 from LK4D4/fix_issue_#3565
...
Using names in docker ps --since-id/--before-id, resolves #3565
Upstream-commit: 22c18de7bed169792213843476d06dedbd1ba387
Component: engine
2014-03-18 15:39:56 -07:00
f8d8a57e3d
Merge pull request #4749 from cpuguy83/add_nofile_noproc_settings_to_upstart
...
Add upstart nofile/noproc similar to systemd init
Upstream-commit: 119839dfd7b8b77eb22ccd45116f45a4bc17a1a6
Component: engine
2014-03-18 15:30:30 -06:00
7d90dd284a
Merge pull request #4740 from vojnovski/patch-1
...
Update ubuntulinux.rst
Upstream-commit: 06d87fd54009aa6a0d420e45bb8df11a7dea31c3
Component: engine
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
2014-03-18 16:27:20 -04:00
