Alexander Morozov
11257dc729
Merge pull request #20403 from runcom/use-test-req
...
integration-cli: use Devicemapper test requirement instead of checkin…
2016-02-17 11:17:26 -08:00
Nishant Totla
6ff0d29c9d
Passing HostConfig for /start endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
2016-02-17 11:06:51 -08:00
Aaron Lehmann
2210b15e08
Fix format string in TestExecApiCreateContainerPaused
...
It was s% instead of %s.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2016-02-17 11:05:51 -08:00
Jeffrey Morgan
0c949dd3df
Download a fixed version of innosetup in the Windows Dockerfile
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2016-02-17 10:53:09 -08:00
Brian Bland
5806f275bf
Merge pull request #1469 from noxiouz/fix_storage_interface_desc
...
Fix description of StorageDriver.WriteStream
2016-02-17 10:46:11 -08:00
Daniel Nephin
d4f2f54cf8
Merge pull request #2936 from dnephin/update_docs_for_161
...
Update docs, fix broken link, use v2 compose file format
2016-02-17 13:34:39 -05:00
Daniel Nephin
4a09da43ea
Fix copying of volumes by using the name of the volume instead of the host path.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-17 13:34:14 -05:00
Jeffrey Morgan
540b46e10f
Merge pull request #419 from embray/welcome-page
...
Re-enable welcome page
2016-02-17 10:21:54 -08:00
Jeffrey Morgan
c760bcfb37
Merge pull request #417 from embray/whitespace-cleanup
...
Whitespace cleanup: Replace all tabs with two spaces
2016-02-17 10:13:27 -08:00
Aaron Lehmann
59a27406cd
Merge pull request #1468 from HuKeping/master
...
Cleanup: remove unused log
2016-02-17 10:00:02 -08:00
Riyaz Faizullabhoy
b31f4e977a
Merge pull request #576 from HuKeping/typo
...
Minor typo
2016-02-17 09:53:52 -08:00
Aaron Turner
e790d9f47a
Enable syncing time for VMWare Fusion guests
...
By default, VMWare Fusion does not sync the guest OS's time to the host
and when running Fusion+docker-machine on a laptop the guest clock will
drift and not resync which can create a variety of problems (such as
authentication issues with AWS, etc)
Signed-off-by: Aaron Turner <synfinatic@gmail.com >
2016-02-17 09:46:39 -08:00
Joffrey F
89108f2a0f
Merge pull request #2939 from AvdN/patch-2
...
for 1.6.0 the version value needs to be a string
2016-02-17 09:42:41 -08:00
Antonio Murdaca
337ee2aa63
integration-cli: use Devicemapper test requirement instead of checking strings
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-02-17 18:18:18 +01:00
David Gageot
ffb9cbed7a
FIX #3056 ls timeout when instance is stopped
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-17 18:09:39 +01:00
Michael A. Smith
736ce7b6ab
Specify correct name for virtio net nic device
...
With VirtualBox 5.0.14r105127, 'virtio-net' is not a valid name for the option. The correct option appears to be 'virtio'.
Signed-off-by: Michael A. Smith <michaels@syapse.com >
2016-02-17 11:28:05 -05:00
Miguel Quintero
3ca3a4bf21
add my name
...
Signed-off-by: Miguel Quintero <miguel.quintero@hpe.com >
2016-02-17 11:15:55 -05:00
Erik M. Bray
6a8bdd65ff
Re-enable welcome page, which was not displaying unless this setup directive is explicitly set
...
Signed-off-by: Erik M. Bray <erik.bray@lri.fr >
2016-02-17 17:00:07 +01:00
Jerome Loisel
c0d03b928e
Fix: missing AMI for ap-northeast-2
...
Ubuntu Server 14.04 LTS (HVM), EBS General Purpose (SSD) Volume Type. Support available from Canonical (http://www.ubuntu.com/cloud/services ).
Signed-off-by: jloisel <jerome.loisel@grinstone.com >
2016-02-17 16:55:58 +01:00
Jean-Laurent de Morlhon
dc5f1e9bdb
Merge pull request #3066 from dgageot/3065-improve-vtx-check
...
FIX #3065 Improve VT-X check
2016-02-17 16:43:43 +01:00
Aleksa Sarai
093dd39686
vendor: update runc/libcontainer
...
This includes all of v0.0.8 as well as a few bug fixes that popped up
during vendoring.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-02-18 01:42:36 +11:00
Brian Goff
7eed9a642e
Merge pull request #20396 from cyphar/remove-fsnotify
...
remove fsnotify
2016-02-17 09:41:31 -05:00
David Gageot
3e6c3c05ce
FIX #3068 DNS Proxy mode
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-17 15:02:27 +01:00
Erik M. Bray
643b6a531b
whitespace cleanup: Replace all tabs with two spaces
...
Signed-off-by: Erik M. Bray <erik.bray@lri.fr >
2016-02-17 14:54:28 +01:00
Aleksa Sarai
bc195e1558
vendor: remove fsnotify
...
It is not longer used by us, so hack/vendor.sh complains because it
removes unused files (but also complains about removing an entire
vendored project).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-02-18 00:12:53 +11:00
Aleksa Sarai
ee99b5f2e9
pkg: remove unused filenotify
...
pkg/filenotify isn't used anymore and it causes problems with
hack/vendor.sh (nothing uses it, so hack/vendor.sh will remove the
vendored code).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
2016-02-18 00:11:43 +11:00
David Gageot
4c9879dcd5
FIX #3065 Improve VT-X check
...
Signed-off-by: David Gageot <david@gageot.net >
2016-02-17 13:46:05 +01:00
Anton Tiurin
a048a4c8d5
Fix description of StorageDriver.WriteStream
...
Offset can be more than CurrentSize as long as this case is checked
by DriverSuite.testContinueStreamAppend.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2016-02-17 13:57:20 +03:00
Sverre Boschman
3dff7aa96a
Testcase start container with hostconfig
...
Signed-off-by: Sverre Boschman <s.r.boschman@gmail.com >
2016-02-17 11:08:29 +01:00
Kai Qiang Wu(Kennan)
60ffd6c880
Make volume ls output order
...
Fixes : #20384
Add order support for volume ls to make it easy
to external users to consume.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-02-17 09:01:27 +00:00
Anthon van der Neut
1512793b30
for 1.6.0 the version value needs to be a string
...
After conversion a file would immediately not load in docker-compose 1.6.0 with the message:
ERROR: Version in "./converted.yml" is invalid - it should be a string.
Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu >
2016-02-17 10:01:16 +01:00
Vincent Demeester
2a9e6ace70
Merge pull request #20385 from WeiZhang555/fix-docs
...
Fix docs
2016-02-17 08:55:02 +01:00
HuKeping
31e32ec102
Minor typo
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-02-17 15:13:00 +08:00
Nishant Totla
d44bef5911
Merge pull request #1825 from abronan/add_report
...
doc: add go report badge on README.md
2016-02-16 22:37:33 -08:00
Phil Estes
5c78515430
Merge pull request #20366 from LK4D4/socks_proxy
...
Add support for forwarding Docker client through SOCKS proxy
2016-02-16 22:29:49 -08:00
HuKeping
5408d4e0a5
Cleanup: remove unused log
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-02-17 14:11:20 +08:00
Alexandre Beslic
c318a6f48a
doc: add go report badge on README.md
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
2016-02-16 21:45:11 -08:00
David Lawrence
1db128778d
completely removing KeyDB
...
Signed-off-by: David Lawrence <david.lawrence@docker.com > (github: endophage)
2016-02-16 21:11:13 -08:00
Kai Qiang Wu(Kennan)
838ed1866b
Make network ls output order
...
Fixes : #20328
We sort network ls output with incresing order,
it may make output more easy to consume for users.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
2016-02-17 04:35:36 +00:00
Zhang Wei
899335022f
Fix docs
...
Fix wrong descriptions in docs
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2016-02-17 11:55:56 +08:00
Arnaud Porterie
bebad9e5c1
Merge pull request #20379 from crosbymichael/exec-test
...
Require linux for TestExecAfterContainerRestart
2016-02-16 19:26:13 -08:00
Tibor Vass
7acd3987d3
Fix index generator for apt/yum packages
...
Some @_@ characters could become visible if filename is longer than 44
characters.
Signed-off-by: Tibor Vass <tibor@docker.com >
2016-02-16 21:54:07 -05:00
Brian Goff
0fe31306d1
Fix issue with multiple volume refs with same name
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2016-02-16 21:46:13 -05:00
HuKeping
6b8a2a0fe4
Bugfix: the actions when pull from notary should not contains push
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2016-02-17 10:36:09 +08:00
Brian Bland
5a1863b76e
Merge pull request #1467 from BrianBland/s3awsFixTest
...
[driver/s3aws] Fix TestStorageClass
2016-02-16 18:14:34 -08:00
Brian Bland
c770f28f04
[driver/s3aws] Fix TestStorageClass
...
Fixes bug in TestStorageClass for s3aws driver where the "standard" file
was checked for reduced-redundnancy storage.
Signed-off-by: Brian Bland <brian.bland@docker.com >
2016-02-16 17:50:55 -08:00
Michael Crosby
46e41dc2f8
Require linux for TestExecAfterContainerRestart
...
All the other exec tests require linux except this one and it is
causing failures in the TP4 test runs.
ref:
https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1076/console
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2016-02-16 17:50:50 -08:00
Diogo Mónica
90d774005b
Merge pull request #575 from docker/yubikey-test-fix
...
Update integration test to exclude yubikeys from importing/exporting non-root keys
2016-02-16 17:45:45 -08:00
Diogo Mónica
071976b47d
Merge pull request #574 from docker/misspell
...
Misspell in Makefile and circleci
2016-02-16 17:45:10 -08:00
Riyaz Faizullabhoy
36c33e6732
Update integration test to exclude yubikeys from importing/exporting non-root
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 17:10:28 -08:00