Evan Hazlett
9b43da0636
Merge pull request #1098 from ibuildthecloud/generic-provisioner
...
Refactor out common logic in UbuntuProvisioner
2015-05-04 15:55:42 -07:00
Alexandre Beslic
ae77390be2
Merge pull request #709 from aluzzardi/integration-fix-attach
...
fix attach integration test
2015-05-04 15:41:12 -07:00
Andrea Luzzardi
af09d0c432
Merge pull request #704 from jimmyxian/bug-fix-tag
...
bug fix: add return when not found image
2015-05-04 15:29:39 -07:00
Andrea Luzzardi
97aad7e60c
fix attach integration test
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 15:18:03 -07:00
John Howard
bb1ecde164
Windows: Filepath in graph\load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 15:14:39 -07:00
John Howard
b30f14f06d
Windows: First fix for graph\graph.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 15:06:51 -07:00
John Howard
377ed712d3
Windows: graph\export.go filepath fixes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 14:56:23 -07:00
Andrea Luzzardi
851e978dcd
Merge pull request #696 from aluzzardi/integration-in-docker
...
integration tests: Support for running within Docker.
2015-05-04 14:54:08 -07:00
Andrea Luzzardi
d41e7c89b2
Merge pull request #708 from aluzzardi/integration-dont-build
...
integration tests: Don't build binaries anymore, it's too slow.
2015-05-04 14:52:01 -07:00
Andrea Luzzardi
c236e2f11d
integration runner: run tests on a fresh binary.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 14:46:00 -07:00
Andrea Luzzardi
2600c8823b
integration tests: Support for running within Docker.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 14:46:00 -07:00
Andrea Luzzardi
4ac0a43753
travis: Lint all shell files.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 14:46:00 -07:00
wlan0
dca9e02b15
Add log opts flag to pass in logging options
...
Signed-off-by: wlan0 <sidharthamn@gmail.com >
2015-05-04 14:39:48 -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
Andrea Luzzardi
f50af455fa
integration tests: Don't build binaries anymore, it's too slow.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 14:20:28 -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
Andrea Luzzardi
aa98a1d5c3
Merge pull request #702 from aluzzardi/integration-fix-exec
...
DO NOT MERGE - Integration fix exec
2015-05-04 13:44:35 -07:00
Andrea Luzzardi
3cc8a2b5fd
Merge pull request #703 from aluzzardi/integration-image
...
integration: Use the brand new dind image.
2015-05-04 13:43:38 -07:00
Andrea Luzzardi
b27e9896bc
Merge pull request #700 from aluzzardi/integration-drivers
...
integration tests: run with native/vfs by default.
2015-05-04 13:43:16 -07: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
Andrea Luzzardi
ad98b865b7
integration: Run engines with --net=host.
...
Since we were mapping the port back to the host anyway, this doesn't
change anything.
However, it does fix `docker exec`.
Fixes #658
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
2015-05-04 13:36:36 -07:00
Alex Elman
7a4e5f3723
Updating the Request Header directive for compatibility with httpd 2.2
...
Signed-off-by: Alex Elman <aelman@indeed.com >
2015-05-04 15:19:53 -05: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
Evan Hazlett
a5aa222f9f
Merge pull request #1101 from hairyhenderson/softlayer-vlan-support-766
...
Adding SoftLayer support for specifying Public and Private VLAN IDs
2015-05-04 12:35:02 -07:00
Evan Hazlett
cab881ee16
Merge pull request #1100 from hairyhenderson/softlayer-getip-private-fix-1099
...
Fixing bug in GetIP where Public IP would always be returned
2015-05-04 12:31:49 -07:00
Evan Hazlett
5404b0e447
Merge pull request #1092 from nathanleclaire/doc_filter_flags
...
Add doc about filtering create flags
2015-05-04 12:31:27 -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
TeckniX
6d9a8de3ed
Fixed stop button showing on initial start
...
Signed-off-by: TeckniX <lokitek@gmail.com >
2015-05-04 13:56:53 -04: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
Tianon Gravi
80a895142e
Update libcontainer and make it the source of truth on logrus version
...
To help avoid version mismatches between libcontainer and Docker, this updates libcontainer to be the source of truth for which version of logrus the project is using. This should help avoid potential incompatibilities in the future, too. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-04 11:02:44 -06: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
Xian Chaobo
da2261f0be
using timeout in wait
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-05-04 21:28:20 +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