d55545783e
Refactor daemon.attach()
...
Also makes streamConfig Pipe methods not return error, since there was
no error for them to be able to return anyway.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 21e44d7a21014f6f0d5e159221f9b9165874a2e1
Component: engine
2015-01-05 15:56:48 -08:00
21017010a3
Sort options in bash completion alphabetically
...
This introduces a sort order for options:
Arrange options sorted alphabetically by long name with the short
options immediately following their corresponding long form.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 70161b4d45ec990a4e597e133092e389e168ad79
Component: engine
2015-01-01 11:21:42 +01:00
6e9adc8ae3
Add missing options to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 50eb14244d3139e8aa9141d8f7076043ffecbc6e
Component: engine
2015-01-01 11:21:42 +01:00
73d7861c36
Merge pull request #9848 from SvenDowideit/add-restart-policy-delay-docs
...
Document that there is a delay before the --restart policy restart, and ...
Upstream-commit: d7f72188ffe3cf98481292d780da463b7de05e58
Component: engine
2014-12-31 12:13:21 -08:00
7792c86d76
Merge pull request #9859 from NateEag/patch-1
...
Grammar fix and style tweak in docs/sources/faq.md
Upstream-commit: 529011cf416857af669cae3e5abdeb6b761ab6b7
Component: engine
2014-12-31 11:58:49 -08:00
87e9875e21
Merge pull request #9491 from SvenDowideit/note-that-volumes-in-b2d-are-special
...
Add a note to point out to new users that B2D bind-mounts are special-ish
Upstream-commit: 880aeab00df218322e246711578690c16312d2a4
Component: engine
2014-12-31 11:15:01 -08:00
5cab04f12d
Merge pull request #9519 from SvenDowideit/1.4-volume-initialization-in-docker-create
...
Talk up the 1.4 change to initialise volumes at time
Upstream-commit: 31471ea2fbfcbc4e08a7333d17075ff901b79f72
Component: engine
2014-12-31 11:59:14 -05:00
af0df9d992
Grammar fix and style tweak in docs/sources/faq.md
...
Just a few things I thought could be improved in the FAQ.
Signed-off-by: Nate Eagleson <nate@nateeag.com >
Upstream-commit: 4e679f218c5da33856df25069368b24e78d8bb85
Component: engine
2014-12-30 21:36:16 -05:00
9911b7b3cb
Merge pull request #9843 from jfrazelle/add-jenkins
...
Add Jenkins Build Status
Upstream-commit: a444643f97e47de72723631f3e2d6ce495f88337
Component: engine
2014-12-30 09:32:32 -08:00
783229617c
Merge pull request #9822 from tianon/01autoremove-kernels
...
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
Upstream-commit: ed7a1fc8f25ff82aaafe043c864f64d606dd0a41
Component: engine
2014-12-30 09:32:04 -08:00
45b07b768f
Add a note to point out to new users that B2D bind-mounts are special-ish
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: e52988528d20a729ed71e47e4d0a5fcb35c92dfc
Component: engine
2014-12-30 13:37:31 +10:00
5ac672fe9b
Talk up the 1.4 change to initialise volumes at time
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 1d4a13867053b58971424f8caf219f935fc66fdd
Component: engine
2014-12-30 13:08:53 +10:00
d5fa05762a
Document that there is a delay before the --restart policy restart, and that its double the last one
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com >
Upstream-commit: 35873e747d5681e42582f51ea48993382cb893a6
Component: engine
2014-12-30 12:36:04 +10:00
a8c9181bdf
Merge pull request #9800 from vieux/execIDs_inspect
...
Add ExecIDs to docker inspect
Upstream-commit: 12fef2d8df4e5da024418e324f7e3c3e82220a27
Component: engine
2014-12-29 15:32:33 -08:00
2156fea332
add test
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: c0bb1c77ee2461f8bceb03202f60f5673815c026
Component: engine
2014-12-29 23:00:17 +00:00
6f0f7a7c16
Merge pull request #9827 from LK4D4/test_for_removing_cgroups
...
Test for issue #9699
Upstream-commit: d47020d18ab22a061982a56f4d0d90658ce5e66a
Component: engine
2014-12-29 13:46:29 -08:00
7ca522fb8e
Merge pull request #9847 from LK4D4/fix_net_host_test
...
Fix net host test
Upstream-commit: b4d09da71508e47f1f1365a65b38776962f261c6
Component: engine
2014-12-29 13:28:15 -08:00
4e25d58828
Add Jenkins Build Status
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7b0519d1ec8edcec773ef5d1e8f24d6a1b0b29f3
Component: engine
2014-12-29 13:15:51 -08:00
3e645815a0
Rewrite TestRunNetHost to compare namespaces
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: e98c08a88fb5f3eedde158a3647a731c31bd4faa
Component: engine
2014-12-29 13:10:30 -08:00
94c4f7ea4b
Fix done messages and error message for ipc tests
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 74ee405a27b19f2d91caaf50029cea3b13ddcaf2
Component: engine
2014-12-29 13:10:16 -08:00
c84951b952
Merge pull request #9842 from jfrazelle/make-whitespace-fixes
...
Fix tabs in project/make.sh
Upstream-commit: 9404e95c08f38cf7ce1474f92903bd813a0bc25f
Component: engine
2014-12-29 12:34:38 -08:00
77c4011e73
Merge pull request #9565 from duglin/DocPtrs
...
Make README point to other critical docker projects
Upstream-commit: b1f620538309efb65e7aacd896353fa2728aee04
Component: engine
2014-12-29 11:17:34 -08:00
70d58a0c84
Fix tabs in project/make.sh
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d27248007f9f4034d1a630e0ac3826af3c3357ec
Component: engine
2014-12-29 11:02:12 -08:00
fc5a9d42ea
Merge pull request #9796 from LK4D4/fix_test_daemon
...
More graceful stop for testing daemon
Upstream-commit: 7156fb24427d48281892771eb9c6b3db10f361a3
Component: engine
2014-12-29 10:01:32 -08:00
72da1b5a4c
Merge pull request #9809 from LK4D4/fix_host_networking
...
Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
Upstream-commit: 43886decfe8677b7095378766cb0426eea1d82e3
Component: engine
2014-12-29 09:55:46 -08:00
fbd81bd660
Merge pull request #9819 from huslage/remove-equal
...
Remove -t="" and -m="".
Upstream-commit: 311d6276adc340c3bcd7ae3be283fca2821874f7
Component: engine
2014-12-29 01:56:15 -05:00
6ef319bb81
Test for host networking
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 732c94a502cbda9a60d76e7af83c0569e919cdb9
Component: engine
2014-12-26 21:04:27 -08:00
f89df3eb6f
Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
...
This fixes wrong behavior of mutating methods of Namespaces object
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: c98ae1f88fccd89eb2184cd2b780f9827ad5ad41
Component: engine
2014-12-26 21:03:48 -08:00
81d2519112
Test for issue #9699
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: eda92e8834f0438ab4ec29fa26c66547279413e5
Component: engine
2014-12-26 20:11:27 -08:00
2180d42ff2
Merge pull request #9246 from estesp/add-oom-event
...
Proposal: Add "OOM killed" event based on OOM state information
Upstream-commit: 8722b6db4ba2359d0f63f2bce7dd981a29d220d1
Component: engine
2014-12-26 22:54:02 -05:00
936e8f916b
Merge pull request #9779 from jfrazelle/9771-non-local-mac-address-test
...
Add test for non local mac address.
Upstream-commit: b49d3dd588f0cfae8fc9bb226a2685fe4f4ccdc1
Component: engine
2014-12-26 19:33:44 -07:00
574dad0b9d
Merge pull request #9792 from jfrazelle/9770-parse-exec-usage
...
Return usage on parseExec error.
Upstream-commit: 819b715b8d7e3ab12be64c289055ae628ba46c08
Component: engine
2014-12-26 17:45:55 -08:00
b24be41066
Merge pull request #9825 from tianon/long-form-names
...
Switch names-generator arrays to be long-form
Upstream-commit: bba3c14e2e15e07fee0e519a7b083dd89614a343
Component: engine
2014-12-26 16:13:48 -08:00
7ce3e89154
Add descriptions for bell, lumiere, morse, nobel, ptolemy, and wright
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 587286bbaafa604078b4d72643c6a855a33e5aa1
Component: engine
2014-12-26 16:53:40 -07:00
4b22c19880
Switch names-generator arrays to be long-form
...
This way, we can embed the link/description lines directly in the array itself, conflicts between PRs to this section are minimized, new PRs are easier to review, and it's a lot easier to notice when people are missing a link/description (like the few that currently are).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: ed21031353ee188e2837a3030b3fbda88e1ce614
Component: engine
2014-12-26 16:44:47 -07:00
847659a0a9
Add CONFIG_POSIX_MQUEUE to check-config.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 8803174e4f8a3f0a2e5d0d077e8bed0607f3cbe3
Component: engine
2014-12-26 14:59:25 -07:00
39ae00e73e
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
...
This file is one APT creates to make sure we don't "autoremove" our currently in-use kernel, which doesn't really apply to debootstraps/Docker images that don't even have kernels installed.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: d30d12c1027e8f2bdb6cac01f8e7cc25d82b0d6a
Component: engine
2014-12-26 14:51:53 -07:00
2ef01256f0
Add test for non local mac address.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 98d5720594d275071f43fbf90daf5fcd1166df8b
Component: engine
2014-12-26 10:22:14 -08:00
13e3da74e0
Merge pull request #9813 from nurkiewicz/banach
...
Stefan Banach in names-generator
Upstream-commit: b98c352e4f7ada1a381746c8fff4feed959881d9
Component: engine
2014-12-26 09:37:16 -08:00
7959035342
Remove -t="" and -m="". Make -t and -m options consistent with help text and other documentation.
...
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
Upstream-commit: 8d7ee3697036d2d1f6c43efcb50b8d8b6c627584
Component: engine
2014-12-26 12:31:01 -05:00
d937286ca7
Fix names-generator comment about name generation
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 6df1eff85e5614dfc1b09e1ff5c4e9cadb0dde0f
Component: engine
2014-12-25 22:54:38 -08:00
40cc868918
Stefan Banach in names-generator
...
Signed-off-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com >
Upstream-commit: 6e96dcec3c524dc05b7d72aa0aab4fd734c03a7d
Component: engine
2014-12-26 00:06:56 +01:00
ea57886ce2
Adjust Dockerfile style to be more consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 179e9deb1abcd1aa8e536aa314f46ea403fb89ba
Component: engine
2014-12-24 00:26:19 -07:00
052111f7e0
Fix indentation
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6c7204393be3cd66c0bc0779d304323e8f8ac6c3
Component: engine
2014-12-23 22:01:04 -08:00
055349b7c9
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: bbb92e1436b5a288d07ef8ea0fad80f2c4715faa
Component: engine
2014-12-24 00:12:35 +00:00
2a5b064872
Merge pull request #9795 from LK4D4/update_libcontainer
...
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
Upstream-commit: 305c898cd7fa8e7152f3f01cfdc2f5c14b4d35f0
Component: engine
2014-12-23 15:41:26 -08:00
ab25e4ba52
Add "OOM killed" event based on OOM state information
...
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 44cab4a4ff05cb1e499fba19394aadb20fc887b8
Component: engine
2014-12-23 18:22:31 -05:00
2a769cedb6
add ExecIDs in inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 4b43a6df7acd98228b8b287eedf38ba87dc8a388
Component: engine
2014-12-23 22:03:20 +00:00
013643a0ba
More graceful stop for testing daemon
...
Fixes problem with TestDaemonAllocatesListeningPort
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8dc86c0e36da3d3206220fffc75004759dd5d2cb
Component: engine
2014-12-23 13:15:19 -08:00
301d5a4920
Return usage on parseExec error.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 7fdbd90f8805736aa78156faf7e6f8fdd2384af7
Component: engine
2014-12-23 12:49:45 -08:00
