Arnaud Porterie
e960e4bb12
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
2015-05-05 14:46:47 -07:00
Sebastiaan van Stijn
f0a8dfd29e
Merge pull request #12993 from psftw/support-tweak
...
Remove blanket "supported" language.
2015-05-05 16:03:02 -04:00
David Calavera
6bb596219f
Merge pull request #12996 from tianon/abri-à-vélo
...
Replace "docker-core" with "docker-engine" in "build-deb"
2015-05-05 10:43:15 -07:00
Alexander Morozov
77266a67e0
Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs
...
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
2015-05-05 09:45:24 -07:00
Alexander Morozov
e894a901db
Merge pull request #12679 from adcaes/12607-remove-error-check
...
Add intValue and use it to get timeout form param in postContainersRestart
2015-05-05 09:38:45 -07:00
Tianon Gravi
5e563d1708
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-05 10:11:59 -06:00
Peter Salvatore
3efc083d4a
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
2015-05-05 11:03:53 -04:00
Adria Casas
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
2015-05-05 08:54:28 +02:00
Tibor Vass
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
Tibor Vass
f838d44283
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
2015-05-04 22:25:13 -07:00
Fred Lifton
677b962642
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
2015-05-04 17:53:37 -07:00
Sven Dowideit
bba5fd8caa
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-05 00:38:41 +00:00
Fred Lifton
77183ed760
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
2015-05-04 16:23:08 -07:00
John Howard
3b2c8f69fd
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 16:18:23 -07:00
Vincent Batts
56c9917815
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
2015-05-04 14:22:52 -07:00
Phil Estes
980c0e8c3b
Merge pull request #12948 from runcom/api-tests-container-delete
...
Add tests for API container delete
2015-05-04 17:08:52 -04:00
Antonio Murdaca
8771cafab6
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 22:41:57 +02:00
Phil Estes
3fcf387d52
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
2015-05-04 15:51:56 -04:00
David Calavera
0a2ccb1cb5
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
2015-05-04 12:48:24 -07:00
mauriyouth
7d371c0b47
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 21:30:52 +02:00
Michael Crosby
f93cbd2448
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
2015-05-04 12:00:42 -07:00
Tibor Vass
87a0ca5283
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
2015-05-04 14:57:58 -04:00
Arnaud Porterie
9c32cd1cef
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
2015-05-04 11:39:09 -07:00
Antonio Murdaca
ea6649e701
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 20:26:11 +02:00
Vincent Demeester
815b472a02
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-04 19:56:10 +02:00
Jessie Frazelle
0c1c272687
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
2015-05-04 10:53:58 -07:00
Phil Estes
4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
Phil Estes
24bd3db0b5
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
2015-05-04 12:58:43 -04:00
Tibor Vass
8ac8c2af60
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
2015-05-04 12:55:46 -04:00
Alexander Morozov
4f5272320c
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
2015-05-04 09:36:55 -07:00
David Calavera
49fd83a25e
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-04 09:28:06 -07:00
Sebastiaan van Stijn
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
unclejack
2e49281bd0
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
2015-05-04 18:35:25 +03:00
Tibor Vass
a8d73339f2
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
2015-05-04 11:10:07 -04:00
Brian Goff
f3023a93d1
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-04 10:49:13 -04:00
unclejack
56f7da34fc
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
2015-05-04 16:57:45 +03:00
Ma Shimiao
1be7a10b89
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-05-04 21:37:44 +08:00
unclejack
175339ffb6
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
2015-05-04 16:28:03 +03:00
HuKeping
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-04 21:11:29 +08:00
Yuan Sun
9eefd2c17d
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-05-04 15:39:40 +08:00
Sven Dowideit
5cec69a7b3
Update the Docker Hub account, org and group documentation and images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-04 00:37:54 +00:00
James Turnbull
fe221852b7
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
2015-05-03 15:42:38 -04:00
Travis Thieman
b40a5eeec8
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
2015-05-03 14:15:17 -04:00
Doug Davis
15313dfdf3
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
2015-05-03 11:10:14 -04:00
Doug Davis
e8bbd87ba8
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
2015-05-03 11:09:25 -04:00
Daniel Zhang
28ea4a63d0
docker images friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-05-03 21:19:18 +08:00
jmzwcn
28547a1a3a
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-05-03 17:23:18 +08:00
Tianon Gravi
e1ccfabdc5
Update fsnotify to 1.2.0
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-02 23:28:15 -06:00
Tianon Gravi
b447fef7ec
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by 341a37095f . 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-02 23:25:57 -06:00
Raghuram Devarakonda
aaaa8bab0c
Adding test for "GET /images/(name)/history" API.
...
Closes #12284 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-05-02 23:09:32 -04:00