93243f693c
Fix net=none w/ TestDaemonNoSpaceleftOnDeviceError
...
Broken by bcb9adf49e6726eccc1ee1ed41fbe21789c2367f
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8e0e9e0f24e5802709508b7c7fe61cb5171ec414
Component: engine
2016-02-18 11:34:34 -05:00
e9b00fc7ff
Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow
...
Fix flaky TestLogsSinceFutureFollow
Upstream-commit: eae59c4226bb94027ed0e51c1899479c44a4cc97
Component: engine
2016-02-16 15:23:19 -08:00
5aea778205
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
Upstream-commit: c795d0bab9057fbf16ca70349bcc37e244be33b9
Component: engine
2016-02-16 15:01:17 -08:00
61b6c6f1c0
Merge pull request #20373 from bastiaanb/fix/docs-trailing-slash-in-dockerfile-copy-example
...
add missing trailing slash in ADD and COPY /absoluteDir examples.
Upstream-commit: c66d9f56279237bc0ff9d8fb84896de4193247f8
Component: engine
2016-02-16 23:10:47 +01:00
90b76dddc5
Merge pull request #20367 from tonistiigi/fix-import-gzip
...
Fix docker import on compressed data
Upstream-commit: 0f5624d37433cd93eb6a19f8d8e513ad399d6d47
Component: engine
2016-02-16 14:09:46 -08:00
f663556077
Merge pull request #19498 from mountkin/refactor-jsonfilelog-reader
...
use pubsub instead of filenotify to follow json logs
Upstream-commit: 8545fdc6ddd7010a4134062cf99444e586c3c99e
Component: engine
2016-02-16 13:55:48 -08:00
6396772da2
add missing trailing slash in ADD and COPY /absoluteDir examples. According to the specs they are mandatory.
...
Signed-off-by: Bastiaan Bakker <bbakker@xebia.com >
Upstream-commit: f982f08c5097e25b901152289faf960d557c130e
Component: engine
2016-02-16 22:52:16 +01:00
f97a378357
Fix flaky TestLogsSinceFutureFollow
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 4928121992cbf3f40ec86909526534d90eb6482e
Component: engine
2016-02-16 13:49:44 -08:00
442a84b35d
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com >
Upstream-commit: 3fe60bbf95b60f1a1e847a48e1c9b9730e570dff
Component: engine
2016-02-16 13:24:49 -08:00
ddc0af4e6a
Merge pull request #19986 from vishh/expose-root-dir
...
Expose docker's root directory by default as part of `docker info`.
Upstream-commit: 80187df25708782db20846e63aef7ddb0419c7cf
Component: engine
2016-02-16 12:57:57 -08:00
e258749926
Merge pull request #20353 from rhatdan/selinux
...
Only relabel /var/lib/docker on initial install
Upstream-commit: d445eb480899db81ff07c1936ae5762cc71d8b77
Component: engine
2016-02-16 12:15:20 -08:00
8b2acafeee
Fix docker import on compressed data
...
Fixes #20296
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: e1c2eb0d35460c2de9cbf4a70439afa63b9d2be1
Component: engine
2016-02-16 11:19:23 -08:00
9315309e4c
Expose docker's root directory by default as part of docker info.
...
Signed-off-by: Vishnu kannan <vishnuk@google.com >
Upstream-commit: 6a3176d4fee3e747ecb6b2d27ab2eb68471f3f8f
Component: engine
2016-02-16 10:40:15 -08:00
ceb4675b07
Merge pull request #20305 from cyphar/fix-apparmor-version-checks
...
Fix apparmor version checks
Upstream-commit: 15d7fa77e1145d52bd9ed5cfe934c1924a9994b2
Component: engine
2016-02-16 10:11:08 -08:00
ec1f2453b9
Merge pull request #20308 from mountkin/fix-20069
...
request a new token before downloading each layer
Upstream-commit: 556b1369de0a776918cb38a0177d219888005705
Component: engine
2016-02-16 09:55:23 -08:00
d67c9f367d
Only relabel /var/lib/docker on initial install
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: 443ada574da41f20cdd3708e2dee3091dd363afb
Component: engine
2016-02-16 08:27:59 -05:00
1bdbb18160
add execute bit to contrib/report-issue.sh
...
Signed-off-by: Elan Ruusamäe <glen@delfi.ee >
Upstream-commit: 5b62b71093283e6e7903870cc4bd4293d45e9630
Component: engine
2016-02-16 12:55:15 +02:00
af98dabc0f
Merge pull request #20341 from MichaelCurrie/patch-1
...
Fix typo
Upstream-commit: 3004c618650c44a5832e24ee1cf8508fbeb48950
Component: engine
2016-02-16 11:16:29 +01:00
8271be384a
Fix the typo
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com >
Upstream-commit: c33cdf9ee3ece0358f828c7ac8f6367c3414e67a
Component: engine
2016-02-16 07:00:01 +00:00
ace5855003
Fix typo
...
Signed-off-by: MichaelCurrie <mcurrie@bruceforceresearch.com >
Upstream-commit: 765880a46a560552bb5a1b5d600199a064d7cee8
Component: engine
2016-02-16 02:51:40 +00:00
1edac85cca
Fixing mismatched network name.
...
Using `my-net` to be consistent with:
https://docs.docker.com/engine/reference/run/
Signed-off-by: Robert Wallis <smilingrob@gmail.com >
Upstream-commit: 8779a4ca62db8b64c5016be20456d5b2e5a407e9
Component: engine
2016-02-15 13:17:05 -08:00
e1a8ad7624
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7da5784b10a9f085af98984e6e69e733e55ddbf5
Component: engine
2016-02-15 15:46:56 +01:00
97fcfe9c7e
optimize pubsub.Publish function
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 1e0f1ec52543bc83099fb91cd34dca4d38100e6f
Component: engine
2016-02-15 19:25:21 +08:00
6ebcbbfdd8
use pubsub instead of filenotify to follow json logs
...
inotify event is trigged immediately there's data written to disk.
But at the time that the inotify event is received, the json line might
not fully saved to disk. If the json decoder tries to decode in such
case, an io.UnexpectedEOF will be trigged.
We used to retry for several times to mitigate the io.UnexpectedEOF error.
But there are still flaky tests caused by the partial log entries.
The daemon knows exactly when there are new log entries emitted. We can
use the pubsub package to notify all the log readers instead of inotify.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
try to fix broken test. will squash once tests pass
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: b1594c59f5e0d1ac898eacde8d91b1ba33c2b626
Component: engine
2016-02-15 19:25:16 +08:00
d9e3cdab8a
apparmor: use correct version for ptrace denial suppression
...
Ubuntu ships apparmor_parser 2.9 erroniously as "2.8.95". Fix the
incorrect version check for >=2.8, when in fact 2.8 deosn't support the
required feature.
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 284d9d451e93baff311b501018cae2097f76b134
Component: engine
2016-02-15 20:36:29 +11:00
08e0c58b53
apparmor: fix version checks to work properly
...
Using {{if major}}{{if minor}} doesn't work as expected when the major
version changes. In addition, this didn't support patch levels (which is
necessary in some cases when distributions ship apparmor weirdly).
Signed-off-by: Aleksa Sarai <asarai@suse.com >
Upstream-commit: 4bf7a84c969b9309b0534a61af55b8bb824acc0a
Component: engine
2016-02-15 20:36:07 +11:00
309c222e17
request a new token before downloading each layer
...
Fixes #20069
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 05b05a358f80b49901a4714b98c2cdb1348c5874
Component: engine
2016-02-14 16:56:07 +08:00
6be195136a
Sixth set of TestBuild CI Enabling for Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 5fc0de2688da4fbe010980a832d8f73bff4be444
Component: engine
2016-02-13 20:54:59 -08:00
a6e2ab5344
Merge pull request #20281 from FrederikNS/master
...
Fish tab completion lists all containers on "docker rm -f"
Upstream-commit: 389a38e1e5145e89dd0f36cc232d5d7c269aed3b
Component: engine
2016-02-13 15:41:52 -05:00
e92dd3c4a5
Merge pull request #20280 from rhuss/patch-2
...
Add network mode `none` to list of possible values
Upstream-commit: 7d9532552b433581253898052849524500a21ff5
Component: engine
2016-02-13 14:21:27 +01:00
d4a856da9f
Extended explanation of NetworkMode's value
...
* Add network mode `none` to list of possible values for API version 1.15 - 1.23
* For API version 1.21 - 1.23 add explanation that any other value is taken as a custom network's name
Signed-off-by: Roland Huß <roland@jolokia.org >
Upstream-commit: c80b36c938306ef9cc9ad6865cfc251a694f59aa
Component: engine
2016-02-13 10:00:51 +01:00
05e211a98f
Merge pull request #20290 from calavera/fix_stop_signal_merge
...
Inherit StopSignal from Dockerfile.
Upstream-commit: 5a9a435d40fb238b627c9e31858b6e31ae38ec53
Component: engine
2016-02-13 09:26:11 +01:00
9f086a0d57
Merge pull request #20141 from cmehay/power8
...
Build golang 1.6 in power8 Dockerfile
Upstream-commit: b384fd6b1b2a379d857b4dc9971e441fe8aa5f37
Component: engine
2016-02-12 20:36:57 -05:00
e71cfe1ecb
Merge pull request #20293 from jfrazelle/fix-release-script
...
dont clean the db
Upstream-commit: beade8276a661f64775dca9aaeee061d1702edfb
Component: engine
2016-02-12 16:30:00 -08:00
98ffe8be11
Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create
...
Check drivers before vol create
Upstream-commit: 79edcc517231e46d1fa9e03081488527143eefae
Component: engine
2016-02-12 18:41:48 -05:00
1f2b78374a
Merge pull request #20278 from aaronlehmann/build-authconfig
...
Pass authentication credentials through to build
Upstream-commit: 64a4605892d8bcc43c73948349bcfede14eb8c3a
Component: engine
2016-02-12 18:37:49 -05:00
c1f0dad274
Merge pull request #20284 from Microsoft/jjh/testunit-pkgarchivestep1
...
Windows CI: test-unit pkg\archive step 1
Upstream-commit: 4fea2be134a3785d79c4efd5c09b2a4afe4c6ecf
Component: engine
2016-02-13 00:37:17 +01:00
f9e2ca50ee
Merge pull request #20287 from duglin/DebugVerCheck
...
Lower warning about old client to a debug
Upstream-commit: bda194491e825013abc38f18a024108e25a7551c
Component: engine
2016-02-12 15:34:02 -08:00
663efc4f39
Inherit StopSignal from Dockerfile.
...
Make sure the image configuration is not overriden by the default
value in the `create` flag.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a252516ec19c9c83055a882da894712f2e812ecc
Component: engine
2016-02-12 17:56:40 -05:00
4fe2cef6bb
dont clean the db
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 477e1fc989dd9a58d7bee78d6bf13e5a24ebd4d6
Component: engine
2016-02-12 13:13:50 -08:00
949eabdb95
Merge pull request #20285 from moxiegirl/fix-user-guide
...
Update the userguide to fix user feedback
Upstream-commit: b734d0e8cc69eadaff86884c200d1ce21b37cdb3
Component: engine
2016-02-12 11:07:03 -08:00
2eb62126dc
Merge pull request #20277 from tiborvass/pgp-mit-fallback
...
Add pgp.mit.edu fallback in Dockerfile
Upstream-commit: 94b0a6b2d99bcd277cba4d54ad0893393065ea81
Component: engine
2016-02-12 13:56:11 -05:00
2298d51345
Lower warning about old client to a debug
...
Ideally I would love to just remove this check entirely because its
seems pretty useless. An old client talking to a new server isn't
an error condition, nor is it something to even worry about - its a normal
part of life. Flooding my screen (and logs) with a warning that isn't
something I (as an admin) need to be concerned about is silly and a
distraction when I need to look for real issues. If anything this should
be printed on the cli not the daemon since its the cli that needs to be
concerned, not the daemon.
However, since when you debug an issue it might be interesting to know the
client is old I decided to pull back a little and just change it from
a Warning to a Debug logrus call instead.
If others want it removed I still do that though :-)
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 059ad5d0a975ab4970fe0be45a79ffa0ef35e366
Component: engine
2016-02-12 10:53:40 -08:00
5d5044b24f
Pass authentication credentials through to build
...
In Docker 1.10 and earlier, "docker build" can do a build FROM a private
repository that hasn't yet been pulled. This doesn't work on master. I
bisected this to https://github.com/docker/docker/pull/19414 .
AuthConfigs is deserialized from the HTTP request, but not included in
the builder options.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 6fed46aeb97943315aed12f2dc62565f7bcc53dc
Component: engine
2016-02-12 10:50:16 -08:00
e88a530ff0
Fish completion lists all containers on "docker rm -f"
...
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com >
Upstream-commit: 2541a23c3aa44fed115a22b36ca7f1770255bbc2
Component: engine
2016-02-12 19:14:35 +01:00
9115c5f1b0
Windows CI: test-unit pkg\archive step 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1a714e76a2cb9008cd19609059e9988ff1660b78
Component: engine
2016-02-12 10:13:44 -08:00
5ceee3f64c
Update the userguide to fix user feedback
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: bf76b1d686018cebd043aa99152d68fbbe6bb977
Component: engine
2016-02-12 10:08:59 -08:00
ee0d6d6dac
Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
...
Fix an erratum; s/two/three/
Upstream-commit: 3a3c9538060ebe300cc2272ad28178450b5fdd53
Component: engine
2016-02-12 09:58:48 -08:00
7a2ded36af
Add pgp.mit.edu fallback in Dockerfile
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 91cdadf37eb99610378a5808b8438f0c4be463c8
Component: engine
2016-02-12 11:54:47 -05:00
1815d82142
Merge pull request #20265 from rhuss/patch-1
...
Fix some formatting
Upstream-commit: c312eab74e2200d443dd5422d1aa5e240b8db473
Component: engine
2016-02-12 17:23:17 +01:00
