529011cf41
Merge pull request #9859 from NateEag/patch-1
...
Grammar fix and style tweak in docs/sources/faq.md
2014-12-31 11:58:49 -08:00
880aeab00d
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
2014-12-31 11:15:01 -08:00
31471ea2fb
Merge pull request #9519 from SvenDowideit/1.4-volume-initialization-in-docker-create
...
Talk up the 1.4 change to initialise volumes at time
2014-12-31 11:59:14 -05:00
4e679f218c
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>
2014-12-30 21:36:16 -05:00
a444643f97
Merge pull request #9843 from jfrazelle/add-jenkins
...
Add Jenkins Build Status
2014-12-30 09:32:32 -08:00
ed7a1fc8f2
Merge pull request #9822 from tianon/01autoremove-kernels
...
Remove /etc/apt/apt.conf.d/01autoremove-kernels in mkimage/debootstrap
2014-12-30 09:32:04 -08:00
e52988528d
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>
2014-12-30 13:37:31 +10:00
1d4a138670
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>
2014-12-30 13:08:53 +10:00
12fef2d8df
Merge pull request #9800 from vieux/execIDs_inspect
...
Add ExecIDs to docker inspect
2014-12-29 15:32:33 -08:00
c0bb1c77ee
add test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-29 23:00:17 +00:00
d47020d18a
Merge pull request #9827 from LK4D4/test_for_removing_cgroups
...
Test for issue #9699
2014-12-29 13:46:29 -08:00
b4d09da715
Merge pull request #9847 from LK4D4/fix_net_host_test
...
Fix net host test
2014-12-29 13:28:15 -08:00
7b0519d1ec
Add Jenkins Build Status
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-29 13:15:51 -08:00
e98c08a88f
Rewrite TestRunNetHost to compare namespaces
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-29 13:10:30 -08:00
74ee405a27
Fix done messages and error message for ipc tests
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-29 13:10:16 -08:00
9404e95c08
Merge pull request #9842 from jfrazelle/make-whitespace-fixes
...
Fix tabs in project/make.sh
2014-12-29 12:34:38 -08:00
b1f6205383
Merge pull request #9565 from duglin/DocPtrs
...
Make README point to other critical docker projects
2014-12-29 11:17:34 -08:00
d27248007f
Fix tabs in project/make.sh
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-29 11:02:12 -08:00
7156fb2442
Merge pull request #9796 from LK4D4/fix_test_daemon
...
More graceful stop for testing daemon
2014-12-29 10:01:32 -08:00
43886decfe
Merge pull request #9809 from LK4D4/fix_host_networking
...
Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
2014-12-29 09:55:46 -08:00
311d6276ad
Merge pull request #9819 from huslage/remove-equal
...
Remove -t="" and -m="".
2014-12-29 01:56:15 -05:00
732c94a502
Test for host networking
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-26 21:04:27 -08:00
c98ae1f88f
Update libcontainer to 0f397d4e145fb4053792d42b3424dd2143fb23ad
...
This fixes wrong behavior of mutating methods of Namespaces object
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-26 21:03:48 -08:00
eda92e8834
Test for issue #9699
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-12-26 20:11:27 -08:00
8722b6db4b
Merge pull request #9246 from estesp/add-oom-event
...
Proposal: Add "OOM killed" event based on OOM state information
2014-12-26 22:54:02 -05:00
b49d3dd588
Merge pull request #9779 from jfrazelle/9771-non-local-mac-address-test
...
Add test for non local mac address.
2014-12-26 19:33:44 -07:00
819b715b8d
Merge pull request #9792 from jfrazelle/9770-parse-exec-usage
...
Return usage on parseExec error.
2014-12-26 17:45:55 -08:00
bba3c14e2e
Merge pull request #9825 from tianon/long-form-names
...
Switch names-generator arrays to be long-form
2014-12-26 16:13:48 -08:00
b97c763249
Merge pull request #9823 from tianon/CONFIG_POSIX_MQUEUE
...
Add CONFIG_POSIX_MQUEUE to check-config.sh
2014-12-26 16:54:14 -07:00
587286bbaa
Add descriptions for bell, lumiere, morse, nobel, ptolemy, and wright
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-26 16:53:40 -07:00
ed21031353
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>
2014-12-26 16:44:47 -07:00
8803174e4f
Add CONFIG_POSIX_MQUEUE to check-config.sh
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-26 14:59:25 -07:00
d30d12c102
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>
2014-12-26 14:51:53 -07:00
98d5720594
Add test for non local mac address.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-26 10:22:14 -08:00
b98c352e4f
Merge pull request #9813 from nurkiewicz/banach
...
Stefan Banach in names-generator
2014-12-26 09:37:16 -08:00
979d2f316a
Merge pull request #9816 from ankushagarwal/names-generator-comment-correction
...
Fix names-generator comment about name generation
2014-12-26 09:35:16 -08:00
8d7ee36970
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)
2014-12-26 12:31:01 -05:00
6df1eff85e
Fix names-generator comment about name generation
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2014-12-25 22:54:38 -08:00
6e96dcec3c
Stefan Banach in names-generator
...
Signed-off-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
2014-12-26 00:06:56 +01:00
4a81661f5e
Merge pull request #9804 from tianon/dockerfile-tweaks
...
Adjust Dockerfile style to be more consistent
2014-12-24 16:23:20 -08:00
179e9deb1a
Adjust Dockerfile style to be more consistent
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2014-12-24 00:26:19 -07:00
4baa240065
Merge pull request #9802 from icecrime/9284_tianon_ocd
...
Fix indentation
2014-12-23 22:42:38 -08:00
6c7204393b
Fix indentation
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2014-12-23 22:01:04 -08:00
bbb92e1436
add docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-24 00:12:35 +00:00
305c898cd7
Merge pull request #9795 from LK4D4/update_libcontainer
...
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
2014-12-23 15:41:26 -08:00
44cab4a4ff
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)
2014-12-23 18:22:31 -05:00
4b43a6df7a
add ExecIDs in inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-12-23 22:03:20 +00:00
8dc86c0e36
More graceful stop for testing daemon
...
Fixes problem with TestDaemonAllocatesListeningPort
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-23 13:15:19 -08:00
7fdbd90f88
Return usage on parseExec error.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-12-23 12:49:45 -08:00
50905a6d6c
Update libcontainer to 1597c68f7b941fd97881155d7f077852e2914e7b
...
This commit contains changes for docker:
* user.GetGroupFile to user.GetGroupPath docker/libcontainer#301
* Add systemd support for OOM docker/libcontainer#307
* Support for custom namespaces docker/libcontainer#279, docker/libcontainer#312
* Fixes #9699 docker/libcontainer#308
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2014-12-23 12:10:03 -08:00
Fred Lifton
James Turnbull
Nate Eagleson
Jessie Frazelle
Sven Dowideit
Alexander Morozov
Victor Vieux
Jessica Frazelle
Alexander Morozov
Tianon Gravi
Aaron Huslage
Ankush Agarwal
Tomasz Nurkiewicz
Arnaud Porterie
Michael Crosby
Phil Estes