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
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
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
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
Brian Goff
2b701e53fd
Merge pull request #19815 from Microsoft/jjh/testruncreatevolumesinsymlinkdir
...
Fix TestRunCreateVolumesInSymlinkDir
Upstream-commit: 9c3cca23e9d8ba62fac2ee29887cf029e42f661b
Component: engine
2016-01-29 21:07:51 -05:00
Brian Goff
e96483b70d
Merge pull request #19823 from Microsoft/jjh/maximus5
...
Improvements to ANSI emulation in conemu
Upstream-commit: c8fb886dba44664575880a605308b3334b8a1cfe
Component: engine
2016-01-29 21:07:22 -05:00
Nishant Totla
9aabd7572f
Adding SystemStatus field for /info endpoint
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: 6c5e8dd4c2351fac8bd76d409f44f42edd4b2f4a
Component: engine
2016-01-29 16:26:43 -08:00
Jess Frazelle
0063d9bddd
Merge pull request #19735 from jfrazelle/add-repo-scripts
...
add scripts to clean experimental rpms and debs
Upstream-commit: c006c0261159224675397162aa3a03d9adbb180b
Component: engine
2016-01-29 15:52:18 -08:00
Aaron Lehmann
45a13ca311
Fix panic on network timeout during push
...
`Upload` already closes the reader returned by `compress` and the
progressreader passed into it, before returning. But even so, the
io.Copy inside compress' goroutine needs to attempt a read from the
progressreader to notice that it's closed, and this read has a side
effect of outputting a progress message. If this happens after `Upload`
returns, it can result in a write to a closed channel. Change `compress`
to return a channel that allows the caller to wait for its goroutine to
finish before freeing any resources connected to the reader that was
passed to it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: e273445dd407df6803d7b80863b644a6cfa2c1f5
Component: engine
2016-01-29 14:34:50 -08:00
Arnaud Porterie
76f6e45741
Merge pull request #19837 from cpuguy83/carry_19085
...
Carry 19085 -- Improve & cleanup documentation comments
Upstream-commit: 46018c3cee3a6fb76373289306f81ede881c9ca6
Component: engine
2016-01-29 14:30:25 -08:00
Jess Frazelle
ddc8de8326
Merge pull request #18176 from hypriot/17802-build-first-debian-package-for-arm
...
add support for building first ARM-based debian package
Upstream-commit: e23f24bbbd33d90b27475dcf2652c412705dbfa8
Component: engine
2016-01-29 13:26:20 -08:00
David Calavera
9d6400f4f2
Merge pull request #19805 from WeiZhang555/test-inspect
...
Make test code consistent
Upstream-commit: 35ef3efe9af64c22c7efbe826f8f63b025639130
Component: engine
2016-01-29 12:43:58 -08:00
John Howard
63723f0837
Windows CI: Porting TestEvents*
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: bf337420263c5b977dac474406483494bccfbb77
Component: engine
2016-01-29 12:33:56 -08:00
Brian Goff
b5c499b982
update doc string
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9c09a79ba54080873b435842fb2a4aaa3b701a9c
Component: engine
2016-01-29 15:25:25 -05:00
David Calavera
0054d8d9e2
Merge pull request #19516 from tophj-ibm/update-registry-on-dockerfile-ppc64le
...
Update registry version in Dockerfile.ppc64le
Upstream-commit: d38cee5e0d5433173da8e7b1db266630c70908b2
Component: engine
2016-01-29 11:53:42 -08:00
Srini Brahmaroutu
c57100a022
Need -lpthread to compile Notary
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 6b09413f6bf309ad8103a0161dc826fc36af2a56
Component: engine
2016-01-29 19:52:39 +00:00
Sebastiaan van Stijn
51a5b9ca15
Merge pull request #19824 from wenchma/name_to_id_for_stats
...
Change container name to id as actual results
Upstream-commit: cfa547922df1cc64cf6a0a96a30da7f5c86f83d5
Component: engine
2016-01-29 10:58:42 -08:00
David Calavera
ddec0cfa16
Merge pull request #19806 from liusdu/forbid-null-login
...
forbid login of a null-string username
Upstream-commit: ca48f7350c82f48edf1150d735543a1ea6d4eabe
Component: engine
2016-01-29 10:34:16 -08:00
David Calavera
cce6e581aa
Merge pull request #19836 from jfrazelle/update-completions-for-disable-content-trust
...
update bash completions for push and pull
Upstream-commit: 7cc012333f36669d384d9c3405759bdadb383f63
Component: engine
2016-01-29 10:29:59 -08:00
Jessica Frazelle
d37bf00209
update bash completions for push and pull
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c40f487c5c744a1a1c87b41002507a13ccffa918
Component: engine
2016-01-29 10:14:36 -08:00
John Howard
c11bcbefde
Fix TestRunCreateVolumesInSymlinkDir
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 90b0292b5b06c5e71d47e5dee34d3d4744682506
Component: engine
2016-01-29 09:28:48 -08:00
Zhang Wei
8bc92ae008
Assert error in body of function inspectField*
...
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 62a856e9129c9d5cf7db9ea6322c9073d68e3ea4
Component: engine
2016-01-29 23:39:07 +08:00
Liu Hua
a9daf50532
forbid login of a null-string username
...
With this patch, the client blocks this type login, no sending
useless messages to daemon and registry. This saves lots of time.
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 755df347fbaf6a02e6bdc2d5b7339aade2dbade0
Component: engine
2016-01-29 22:39:22 +08:00
Antonio Murdaca
7f6eb0a2ca
postImagesCreate: move auth config decode when it's needed
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a7d1aeceec53cfefd72e5b2161c2c57eae20cf55
Component: engine
2016-01-29 14:07:54 +01:00
Antonio Murdaca
4ce68d47a6
api: client: remove redunant function to encode auth
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 505a56d6da69825e2ef1ebcf985a0a2e143d2966
Component: engine
2016-01-29 14:07:54 +01:00
Vincent Demeester
426fb03f9a
Merge pull request #19793 from calavera/full_login_prompt
...
Always prompt for a password when asking for credentials.
Upstream-commit: 6c6729ef5b74a54e20eb2a11812bf5f80e03b174
Component: engine
2016-01-29 12:39:57 +01:00
Vincent Demeester
e306c92f3c
Merge pull request #19790 from Microsoft/CombineSetupWorkingDir
...
Combine SetupWorkingDirectory for Linux and Windows
Upstream-commit: 5f63c541920ff1ef9d82220f4a18cd7531f3973a
Component: engine
2016-01-29 08:52:08 +01:00
Wen Cheng Ma
e4d391225e
Change container name to id as actual results
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: d76fba0191fc64759febc1ee22c6bc28ff49b3d6
Component: engine
2016-01-29 13:54:28 +08:00
John Howard
aba5001cd8
Improvements to ANSI emulation in conemu
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 506722bf9ffd017db59f3ae14addb59c9bf227ab
Component: engine
2016-01-28 20:37:42 -08:00
Sebastiaan van Stijn
29c84a9273
Merge pull request #19563 from Microsoft/10662-TestBuildCI1
...
First batch of Windows-Windows TestBuild CI enabling
Upstream-commit: 7d13f2fb7d50e2cf93022a692fe93a59ee65e866
Component: engine
2016-01-28 17:13:45 -08:00
Tibor Vass
0cbea6f330
Merge pull request #19795 from jfrazelle/release-checklist
...
some cleanup to release checklist
Upstream-commit: 4da9cd5df64dced9df07432e8047ca4c901f7238
Component: engine
2016-01-28 16:43:57 -08:00
Tibor Vass
1a1c305766
Merge pull request #19811 from albers/completion-user
...
Improve bash completion for users and groups
Upstream-commit: 17be787dca98ba256ea4ea00a16dd8e5afcf5b3c
Component: engine
2016-01-28 16:39:26 -08:00
Arnaud Porterie
7ba847aa45
Merge pull request #19796 from Microsoft/10662-RemoveTestBuildHistory
...
Temporarily removing TestBuildHistory on Windows for perf reasons
Upstream-commit: f746cf04406105bdd2ff213cd16e62e09c279b69
Component: engine
2016-01-28 16:34:55 -08:00
John Howard
c8f14431b3
Windows CI: Port TestExecApi* tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9642c8170aa979050a81451378aa4c7917e9df28
Component: engine
2016-01-28 16:26:06 -08:00
Govinda Fichtner
9512e36135
add support for building first ARM debian package
...
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com >
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
2016-01-29 00:21:17 +01:00
Darren Stahl
913281f6d2
Temporarily removing TestBuildHistory on Windows for perf reasons
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 87839b345ea481702849ccada6fe429c378df85a
Component: engine
2016-01-28 13:42:02 -08:00
Brian Goff
00eed2df45
Merge pull request #19812 from jgeiger/patch-1
...
Fix typos in create.go
Upstream-commit: 5ee4ad1d77aecb157ace2fc455e32984e726b97f
Component: engine
2016-01-28 16:12:06 -05:00
Kai Qiang Wu(Kennan)
Sebastiaan van Stijn
Prayag Verma
Nigel
Antonio Murdaca
Brian Goff
Doug Davis
Vincent Demeester
Zhang Wei
John Howard
Joffrey F
Nishant Totla
Jess Frazelle
Aaron Lehmann
Arnaud Porterie
David Calavera
Srini Brahmaroutu
Jessica Frazelle
Liu Hua
Antonio Murdaca
Wen Cheng Ma
John Howard
Tibor Vass
Govinda Fichtner
Darren Stahl