Commit Graph
21884 Commits
Author SHA1 Message Date
Tibor Vass 848ab2d223 Merge pull request #19891 from icecrime/windows_login_issue
Enable cross-platforms login to Registry
Upstream-commit: 19eaa71e85f9563e1428347fa9a91c8aa71f1f6d
Component: engine
2016-02-01 19:50:54 -05:00
David Calavera 252a3f9cb5 Merge pull request #19794 from calavera/14358-disable-colors
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
Upstream-commit: 85475f7deabed7d94e98321bdb190f7eb756eaec
Component: engine
2016-02-01 15:37:44 -08:00
David Calavera b8ca800cbc Merge pull request #19893 from cpuguy83/19890_debugs_for_all
handle debug mode for clients
Upstream-commit: 1734571539c8d1eb7928873ac03b948149ebafbb
Component: engine
2016-02-01 14:53:37 -08:00
Sebastiaan van Stijn 6118a0b79d Merge pull request #19898 from joelwurtz/patch-1
Update docker-php link library from stage1
Upstream-commit: cf93b0bce1b24d30c9a1480ddb15a1f83f2b5fd4
Component: engine
2016-02-01 23:37:11 +01:00
Sebastiaan van Stijn 6dc1df39d7 Merge pull request #19714 from vdemeester/carry-pr-18787
Carry #18787: Update Instructions for Docker Remote API access
Upstream-commit: d95c4872135b0926e7911bf2b0b699e347c41e82
Component: engine
2016-02-01 23:26:40 +01:00
David Calavera fd11be5874 Add test to make sure raw logs are properly activated.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 898599171e2f36a1cf36a2eea31d82a226acd802
Component: engine
2016-02-01 16:52:31 -05:00
Joel Wurtz ba3948fd3c Update docker-php library from stage1
Signed-off-by: Joel Wurtz <joel.wurtz@gmail.com>
Upstream-commit: 9928b244e9c1eb32eb63fc7a9666a946ca8729d6
Component: engine
2016-02-01 22:45:34 +01:00
Arnaud Porterie 6da068ab26 Merge pull request #19553 from anusha-ragunathan/rm-daemonbuilder
Remove package daemonbuilder.
Upstream-commit: 680cf1c8f4164d7b3e95759a7cc93ce5843e5543
Component: engine
2016-02-01 13:20:00 -08:00
Vincent Woo fb14e6604b Allow disabling of colored Docker logs via daemon flag.
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
2016-02-01 16:19:18 -05:00
David Calavera c20ed2f433 Merge pull request #19416 from mlaventure/warn-on-rm-detach
Print an info message when detaching a container started with --rm
Upstream-commit: 245d6e83a9e739d0d6ab363bfabf779c9b1697f2
Component: engine
2016-02-01 13:17:23 -08:00
Arnaud Porterie 810a289a07 Merge pull request #19570 from WeiZhang555/18679-flaky-test
Fix flaky test `TestGetContainerStatsRmRunning`
Upstream-commit: a898478a795f3839b67ff119922bd0ba7d091a7e
Component: engine
2016-02-01 13:15:20 -08:00
Brian Goff f0d917c642 Merge pull request #19725 from WeiZhang555/opt-TestRunSeccompDefaultProfile
Optimize `TestRunSeccompDefaultProfile`
Upstream-commit: c28bba04601c153af5d8f70dd500e7247157b835
Component: engine
2016-02-01 16:01:51 -05:00
David Calavera 6337f0e1f4 Merge pull request #19708 from wenchma/19425-TestDaemonCorruptedLogDriverAddress
Optimize slow bottleneck tests of TestDaemonCorruptedLogDriverAddress
Upstream-commit: 0c620d62c2a538ae61af7dde33e013f095fe0686
Component: engine
2016-02-01 12:59:37 -08:00
Brian Goff 2dcfdf5354 handle debug mode for clients
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 78b0defcf344294874202e819dcb3f8a0daedf43
Component: engine
2016-02-01 14:36:40 -05:00
Arnaud Porterie 09d7504264 Enable cross-platforms login to Registry
Use a daemon-defined Registry URL for `docker login`. This allows a
Windows client interacting with a Linux daemon to properly use the
default Registry endpoint instead of the Windows specific one.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 960710bd810e70b7c06b77b956c7bf8cdfeb15f8
Component: engine
2016-02-01 11:18:54 -08:00
David Calavera 65eec6c5ac Merge pull request #19885 from tophj-ibm/fix-integration-cli-suite-requirements
Fix integration-cli suite setup requirements
Upstream-commit: c19c08b97af613928bce1253e438e3c097ade7df
Component: engine
2016-02-01 11:13:39 -08:00
Anusha Ragunathan fe296e65a0 Remove package daemonbuilder.
Currently, daemonbuilder package (part of daemon) implemented the
builder backend. However, it was a very thin wrapper around daemon
methods and caused an implementation dependency for api/server build
endpoint. api/server buildrouter should only know about the backend
implementing the /build API endpoint.

Removing daemonbuilder involved moving build specific methods to
respective files in the daemon, where they fit naturally.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 9c332b164f1aefa2407706adf59d50495d6e02cb
Component: engine
2016-02-01 09:57:38 -08:00
Alexander Morozov 62fbfcd843 Merge pull request #19857 from aboch/vnd
Vendoring libnetwork 0.6.0-rc6
Upstream-commit: 69c381c8d1abcea98c7a700b45a4aae28675f7fe
Component: engine
2016-02-01 08:32:02 -08:00
Brian Goff ed1802777e Merge pull request #19873 from HackToday/refactorfs
Make btrfs call same interface as others
Upstream-commit: 967848419af3e1d07d402a13e5893f4747a87914
Component: engine
2016-02-01 10:36:59 -05:00
Sebastiaan van Stijn f274470025 Merge pull request #19695 from Microsoft/10662-TestBuildCI2
Second set of enabling TestBuild CI for Windows
Upstream-commit: c2d6831fc498383be0ba9e555e3ab3139b844bb9
Component: engine
2016-02-01 16:29:52 +01:00
Vincent Demeester f73d475533 Merge pull request #19867 from Microsoft/jjh/disableunreliabletests
Windows CI: Turn off unreliable TP4 tests
Upstream-commit: ec67c8c4b6c9fd2bd6a0b434de77bc2be8524c58
Component: engine
2016-02-01 13:50:26 +01:00
Sebastiaan van Stijn f8a229cffb Merge pull request #19882 from vdemeester/add-ipfs-volume-plugin
Add docker-volume-ipfs plugin to the list.
Upstream-commit: 179cd3e8bc5e11fad05c18f2d44623d4fb8df7df
Component: engine
2016-02-01 13:41:19 +01:00
Vincent Demeester 1b865aed78 Add docker-volume-ipfs plugin to the list.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b01886a556db9738b226fbcdd2384aff34118413
Component: engine
2016-02-01 13:30:15 +01:00
Vincent Demeester 42a8fa4b43 Merge pull request #19883 from quofelix/master
Added link to Quobyte's volume plugin.
Upstream-commit: 63335df3d44d7787ed974bca3e920333ca721083
Component: engine
2016-02-01 13:10:17 +01:00
Felix Hupfeld 21a85d3fd5 Added link to Quobyte's volume plugin.
Signed-off-by: Felix Hupfeld <felix@quobyte.com>
Upstream-commit: 518c20787b5691e41261218b8b4e6671ddc646f3
Component: engine
2016-02-01 12:51:05 +01:00
Lei Jitang 176b8546e1 Merge pull request #19875 from Qiaohai8866/master
change 'host:port' to `host:port`
Upstream-commit: 743978e3ba7c95f6be0d0831179776b07735389e
Component: engine
2016-02-01 18:47:14 +08:00
qg af0e1e3cc9 change 'host:port' to host:port
Signed-off-by: Gang Qiao <qiaohai8866@gmail.com>
Upstream-commit: 7d1018545f5c38c936ed893145e70f84b8f50976
Component: engine
2016-02-01 17:22:16 +08:00
Kai Qiang Wu(Kennan) 7aca59c08a Make btrfs call same interface as others
Most storage drivers call graphdriver.GetFSMagic(home),
it is more clean to easy to maintain. So btrfs need to
adopt such change.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: feda5d768439c6ecb8d3c82cee332724302e7cd2
Component: engine
2016-02-01 07:50:21 +00:00
Antonio Murdaca 15fc2d2d91 Merge pull request #19872 from ZhuWeiyang/fix-ubuntulinux-upgrade
Fix upgrade command in ubuntulinux
Upstream-commit: 0f124979c2816af92e6c9af8b9315945cf81820c
Component: engine
2016-02-01 07:11:40 +01:00
Weiyang Zhu 529d3187ec Fix upgrade command
Signed-off-by: Weiyang Zhu <cnresonant@gmail.com>
Upstream-commit: a80c404cc61344067ae319ff82f78a22b31d4dbf
Component: engine
2016-02-01 12:59:21 +08:00
John Howard 697d1c2bb0 Windows CI: Turn off unreliable TP4 tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 59f4369f1a09462ec0a2c6777931051fc1324396
Component: engine
2016-01-31 15:51:56 -08:00
Sebastiaan van Stijn 1a1060798c Merge pull request #19864 from pra85/patch-1
Fix typo
Upstream-commit: 40ce2574b4bc0c50f78c086768a67f7cb24feb70
Component: engine
2016-01-31 22:58:19 +01:00
Prayag Verma 7637bcdb16 Fix typo
Signed-off-by: Prayag Verma <prayag.verma@gmail.com>
Upstream-commit: 86beb6e27e9954e50828993ef0fb44486d2318ab
Component: engine
2016-02-01 01:25:59 +05:30
Sebastiaan van Stijn c58b07c2d6 Merge pull request #19856 from moxiegirl/carry-close-19240
Updating for CAS changes and new select a driver section
Upstream-commit: 6f86bcee76dc7fc0faab7d4dffe4a05801526816
Component: engine
2016-01-31 15:52:14 +01:00
Zhang Wei 90c255b82a Fix flaky test TestGetContainerStatsRmRunning
Remove racey code to fix flaky test

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 9a9ce80a0f5214011ddf68f93894b1c046435a8d
Component: engine
2016-01-31 15:34:22 +08:00
Alessandro Boch 1fc2a011dc Vendoring libnetwork 0.6.0-rc6
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f943fd7d2427fbf893b9e0795528500fc99081b8
Component: engine
2016-01-30 20:03:03 -08:00
Nigel 486d68813e Updating for CAS changes and new select a driver section
Adding changes requested by @jamtur01 and wrapping to 80 chars
Adding typo fixes and replacing tabs with 4xspaces
Closes and fixes #19240
Updating with content addressable storage model changes

Signed-off-by: Nigel <nigelpoulton@hotmail.com>
Upstream-commit: 89923c1f32aeff5bf11fbb04723dd0e154559545
Component: engine
2016-01-30 18:03:04 -08:00
Antonio Murdaca bb23b6aa53 Merge pull request #19847 from Microsoft/jjh/revert19790
Revert PR 19790 (breaks windowsTP4 CI on cache bust)
Upstream-commit: 5f5a752bcf687aab0120e6c7903922ff01371ec0
Component: engine
2016-01-30 20:28:21 +01:00
Sebastiaan van Stijn 18160b41cf Merge pull request #19846 from shin-/remote_api_container_update_doc
Update example request for container update in docs.
Upstream-commit: d069e8e7b7733fbde5889d3afd97cac21ff474b3
Component: engine
2016-01-30 08:05:55 -08:00
Brian Goff cb234f712d Merge pull request #19638 from runcom/remove-redunant-function
cleanup and move stuff where needed
Upstream-commit: d695cf8de710ca50f5c2b39727f00bfd4be8e07f
Component: engine
2016-01-30 10:12:38 -05:00
Doug Davis b220d6d726 Merge pull request #19852 from WeiZhang555/warn-info
Change log level
Upstream-commit: 80c7258e11c6434658ecb1a7d7e96f0d0390eef3
Component: engine
2016-01-30 09:58:47 -05:00
Antonio Murdaca feb2fde581 Merge pull request #19820 from Microsoft/jjh/testexecapi
Windows CI: Port TestExecApi* tests
Upstream-commit: 667c2245ad42de7ef76c0fefc06f77c566cb01eb
Component: engine
2016-01-30 11:50:01 +01:00
Vincent Demeester 8c7b621b27 Merge pull request #19646 from nishanttotla/19277-CustomInfoField
Display SystemStatus field in docker info
Upstream-commit: 6b573801730f7655a1e2ef1edc35df8e32b713f7
Component: engine
2016-01-30 11:48:01 +01:00
Antonio Murdaca c96ae440f0 Merge pull request #19839 from Microsoft/jjh/testevents
Windows CI: Porting TestEvents*
Upstream-commit: 98ef10f64e81bb4389b42785235e7736d5835924
Component: engine
2016-01-30 11:47:44 +01:00
Zhang Wei b810382f68 Change log level
Warning should be printed with real `logrus.Warn`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 98f74f8383241d2f0a5ed8b17f7016e24af899fa
Component: engine
2016-01-30 18:46:16 +08:00
Sebastiaan van Stijn eaa6145849 Merge pull request #19838 from brahmaroutu/fix_notary_gccgo_s390x
Need -lpthread to compile Notary
Upstream-commit: 317c89ce9e2800814e9044aaf65ca6fa5bdbdee5
Component: engine
2016-01-29 22:33:57 -08:00
John Howard 342ab710cd Signed-off-by: John Howard <jhoward@microsoft.com>
Revert "Combine SetupWorkingDirectory for Linux and Windows"

This reverts commit ec31741ca186278ea60faf49f85087c493e78806.
Upstream-commit: 54320d8d187d8b33be4fd33cfb3f8e486c6c8d90
Component: engine
2016-01-29 20:49:39 -08:00
Brian Goff 180ae31aca Merge pull request #19841 from aaronlehmann/compress-panic
Fix panic on network timeout during push
Upstream-commit: 0c09dda80f2f5b00c84426560208b9e3dd75138a
Component: engine
2016-01-29 22:15:13 -05:00
Zhang Wei 75517ee0fb Optimize TestRunSeccompDefaultProfile
Optimize performance of `TestRunSeccompDefaultProfile`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2e9bb7870a0ea4a2fdc3fdbe6686ed6159f08803
Component: engine
2016-01-30 10:42:06 +08:00
Joffrey F 6d05098f7a Update example request for container update in docs.
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 5f0643b082d4fe5a7be9fa0a00088e3e37882824
Component: engine
2016-01-29 18:35:29 -08:00