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
5ac53676ce
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
2014-03-18 23:30:21 +04:00
9f3a8a726d
Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
...
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
2014-03-18 11:28:42 -07:00
4879ef6f17
Merge pull request #4733 from vieux/3729_time_exit
...
add time since exit in docker ps
Upstream-commit: 1e56ec8b67e77a1e99f12b7e7c04245477202c9c
Component: engine
2014-03-18 11:25:11 -07:00
e8fa51d05e
typo
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: c76def2dd23cf90fdc80224f08530205b6dcba73
Component: engine
2014-03-18 13:46:38 -04:00
7a2dc6bc24
packagers: btrfs build tag docs
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 29c45e7f4fc616290e416f1b541e1739820af60c
Component: engine
2014-03-18 13:45:36 -04:00
856d46eee0
btrfs: build tags
...
correct filename and make the tag more readable
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5cfea26bcfc218ca72eac7115fa257833f28b9f2
Component: engine
2014-03-18 13:44:23 -04:00
cdf7c6a1a7
btrfs: build tags
...
Default to the same build behavior, but allow a go build tag to disable
building of the btrfs graphdriver
go build -tags no_btrfs' ...
$ go build
$ objdump -S docker | grep btrfs | wc -l
194
$ go build -tags no_btrfs
$ objdump -S docker | grep btrfs | wc -l
1
# that is a comment ;-)
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 85a62d9b779bfb351e159f38c2fc95900a0532cd
Component: engine
2014-03-18 13:44:22 -04:00
afc3313920
Merge pull request #4674 from vbatts/vbatts-graphdriver_build_tags
...
graphdriver: build tags
Upstream-commit: f14c0866ecb5ee38be8d6859ced730d431610743
Component: engine
2014-03-18 10:25:59 -07:00
2e49d88eb6
Merge pull request #4739 from alexlarsson/dm-timeout
...
devmapper: Increase timeout in waitClose to 10sec
Upstream-commit: 8ac6400749f6a000891b18ca1d36c10c8b7461d8
Component: engine
2014-03-18 10:12:59 -07:00
c798edd116
Update ubuntulinux.rst
...
Adding the Docker repository key fails if port 11371 not open. This would probably work for more people.
Upstream-commit: ae1dd52b19d075c2f4ba75cf0549c644725834e8
Component: engine
2014-03-18 17:10:22 +01:00
186bfcdec8
devmapper: Increase timeout in waitClose to 10sec
...
As reported in https://github.com/dotcloud/docker/issues/4389 we're
currently seeing timeouts in waitClose on some systems. We already
bumped the timeout in waitRemove() in
https://github.com/dotcloud/docker/issues/4504 .
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: a70beda1ecfb049a3f80ad5b159ba51d653fd067
Component: engine
2014-03-18 15:54:40 +01:00
fb7b463fb2
add env hint
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: e5cbb5c906d37b14dbf0180d253f58f8995de571
Component: engine
2014-03-18 22:29:11 +10:00
eb110a5588
Merge pull request #4731 from crosbymichael/fix-execin
...
Only unshare the mount namespace for execin
Upstream-commit: 3782900405c20e812d80f339c63844c0228cb74a
Component: engine
2014-03-17 18:59:26 -07:00
b02e8511f3
runtime: no build tags for vfs driver
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 448b64164df7795cdbd9be0d663269e6e4e4beeb
Component: engine
2014-03-17 21:54:43 -04:00
0ba8b13022
graphdriver: build tags
...
Enable build tags for all the graphdrivers to be excludable.
As an example:
```
$ go build
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 18400158 Mar 14 14:22 docker*
$ go build -tags "exclude_graphdriver_aufs exclude_graphdriver_vfs exclude_graphdriver_devicemapper"
$ ls -l docker
-rwxr-xr-x 1 vbatts vbatts 17467068 Mar 14 14:22 docker*
```
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 670ce98c60dbac1d46a59bd69bd20b569f4794f1
Component: engine
2014-03-17 21:54:05 -04:00
2d58b8bf60
Only unshare the mount namespace for execin
...
Fixes #4728
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 4b1513f9c394fbfdf21998db4318251b4e8b6bc0
Component: engine
2014-03-17 18:52:56 -07:00
bf660d94fc
add time since exit in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 15a267b57d2394dd5cb697f9a80b6df4fc939a76
Component: engine
2014-03-18 01:34:43 +00:00
3865d7d383
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
0aaef1f844
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
Upstream-commit: fb503da34e2eae1aab3a54eed4c5a2374fa35c7d
Component: engine
2014-03-18 00:38:39 +02:00
c4297c670a
Merge pull request #4702 from timthelion/Issue#4681-1
...
Fix Issue#4681
Upstream-commit: 30541ade821392710edb5bbdd72bd1d1c246e04b
Component: engine
2014-03-17 15:31:54 -07:00
e839931238
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
Upstream-commit: 25218f9b239784e6f38550a6e320bce56aaca3e1
Component: engine
2014-03-17 15:12:02 -07:00
ff82619b66
Refactor out interface specific information from execdriver.Network
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 659b719aa66e7ed0c3104d3704fa61035050ad82
Component: engine
2014-03-17 22:53:48 +01:00
431a7612ca
Merge pull request #4689 from ralphbean/patch-1
...
Update fedora.rst
Upstream-commit: 865310e99daf93002b233cf7d4d5c2d1ac40c3ae
Component: engine
2014-03-18 07:49:48 +10:00
ccebbeffe2
Fix issue #4681 - No loopback interface within container when networking is disabled.
...
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Remove loopback code from veth strategy
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Looback strategy: Get rid of uneeded code in Create
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Use append when building network strategy list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Swap loopback and veth strategies in Networks list
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Revert "Swap loopback and veth strategies in Networks list"
This reverts commit 3b8b2c8454171d79bed5e9a80165172617e92fc7.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
When initializing networks, only return from the loop if there is an error
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 353df19ab7009f6555dee506841ae0b690a08768
Component: engine
2014-03-17 22:01:24 +01:00
73c73fe476
Add failing test case for issue #4681
...
Add a failing test case for an issue where docker is not creating a loopback device if networking is dissabled.
Docker-DCO-1.1-Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz > (github: https://github.com/timthelion )
Upstream-commit: 53c5b1856d91093fed1c2d3f038d227f5fdef4b8
Component: engine
2014-03-17 22:01:24 +01:00
c6aab2eaa4
Merge pull request #4723 from vieux/fix_panic_monitor
...
fix panic in monitor
Upstream-commit: dd040c98706cd8ee3022061a63dc064b31fff890
Component: engine
2014-03-17 13:52:22 -07:00
ec6d6bab54
Merge pull request #4721 from vieux/4716-display_ps-fix
...
Fix display command display in docker ps
Upstream-commit: 0e92c7c24a64a4cc36b38ffb35f3e8498bcb1790
Component: engine
2014-03-17 22:04:00 +02:00
06d35a04d8
fix panic in monitor
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 1dfc44073399aadb226c1b4c1909fb15c033d44a
Component: engine
2014-03-17 19:33:40 +00:00
2f4b69fe2b
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf
Component: engine
2014-03-17 19:17:40 +00:00
511a3e0407
Disable automatic killing of containers when docker stop fails
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5
Component: engine
2014-03-17 15:15:44 -04:00
8d099b8012
Gofmt imports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2bddcd68b4b927d36ffadd80e098f6d4ae2cf5d6
Component: engine
2014-03-17 11:41:28 -07:00
d986adda7d
Add missing client doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a18d08177c1b11fd1e88c27d78a7256b5d498d64
Component: engine
2014-03-17 18:40:57 +00:00
5a4e6f4343
update doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: afcaaffd0bb84d0c97f4a3ef54f4d35ba3942f65
Component: engine
2014-03-17 18:40:57 +00:00
c7bbb9caec
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: edd8d2d3511b0b632149d1c1f2cfd2bad2df4679
Component: engine
2014-03-17 18:40:57 +00:00
742b723fc2
Move graphdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 96c4816cef592a98a235010924bb2417c8451079
Component: engine
2014-03-17 11:40:12 -07:00
68860e9695
Move execdrivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: af385151ceedde097eda8a5195b431e8076cf76b
Component: engine
2014-03-17 11:40:12 -07:00
4b7a6e2613
Move networking drivers into runtime top level pkg
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 2230c9b9a735d731cc2fee4137633eb98b9da9d5
Component: engine
2014-03-17 11:40:12 -07:00
063cfadb64
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
Upstream-commit: 2ada6441db6ac42abd42ac6ac7ad7439da123d0e
Component: engine
2014-03-17 20:38:26 +02:00
a3b952c15e
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
Upstream-commit: f9bd6c860d2b07bd44f3dff98255bce34ded883b
Component: engine
2014-03-17 11:36:56 -07:00
cad533fcfe
display command display in docker ps
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 5921b186d17b172f205f3b0b6bda1f3a4e650d3f
Component: engine
2014-03-17 18:36:15 +00:00
4ff432cad1
Merge pull request #4645 from crosbymichael/add-logger
...
Add logger to libcontainer
Upstream-commit: 597e0812fb8a40cf73388bcc44e6be74035a9846
Component: engine
2014-03-17 11:30:14 -07:00
6fae2857fa
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
Upstream-commit: d81021803820b807875ef76676d723eee5b0faee
Component: engine
2014-03-17 11:24:18 -07:00
29edaa65ac
Update fedora.rst
...
It looks like ``wmdocker`` does not have an update for Fedora 20:
```
~❯ pkgwat releases wmdocker
Starting new HTTPS connection (1): apps.fedoraproject.org
+---------------+----------------+-----------------+
| release | stable_version | testing_version |
+---------------+----------------+-----------------+
| Rawhide | 1.5-12.fc21 | None |
| Fedora 20 | None | None |
| Fedora 19 | None | None |
| Fedora EPEL 7 | None | None |
| Fedora EPEL 6 | None | None |
| Fedora EPEL 5 | None | None |
+---------------+----------------+-----------------+
```
I'm not sure if the owner awjb is intending to create an F20 update or
not, but either way -- these docs are incorrect as currently written.
Docker-DCO-1.1-Signed-off-by: Ralph Bean <rbean@redhat.com > (github: ralphbean)
Upstream-commit: a62c7215c6c4675a4f99b63871d89198b211c260
Component: engine
2014-03-17 14:18:11 -04:00
f1b6288e96
Merge pull request #4719 from philips/Capabilities-to-CapabilitiesMask
...
refactor(libcontainer): rename to CapabilitiesMask
Upstream-commit: 73f5aa87af0feb22570d1ea1b71ac58b874ac4cd
Component: engine
2014-03-17 11:15:29 -07:00
