Commit Graph

22279 Commits

Author SHA1 Message Date
Alexander Morozov 0f5624d374 Merge pull request #20367 from tonistiigi/fix-import-gzip
Fix docker import on compressed data
2016-02-16 14:09:46 -08:00
Alexander Morozov 8545fdc6dd Merge pull request #19498 from mountkin/refactor-jsonfilelog-reader
use pubsub instead of filenotify to follow json logs
2016-02-16 13:55:48 -08:00
David Calavera 80187df257 Merge pull request #19986 from vishh/expose-root-dir
Expose docker's root directory by default as part of `docker info`.
2016-02-16 12:57:57 -08:00
Jess Frazelle d445eb4808 Merge pull request #20353 from rhatdan/selinux
Only relabel /var/lib/docker on initial install
2016-02-16 12:15:20 -08:00
Tonis Tiigi e1c2eb0d35 Fix docker import on compressed data
Fixes #20296

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-16 11:19:23 -08:00
Vishnu kannan 6a3176d4fe Expose docker's root directory by default as part of `docker info`.
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-02-16 10:40:15 -08:00
Jess Frazelle 15d7fa77e1 Merge pull request #20305 from cyphar/fix-apparmor-version-checks
Fix apparmor version checks
2016-02-16 10:11:08 -08:00
David Calavera 556b1369de Merge pull request #20308 from mountkin/fix-20069
request a new token before downloading each layer
2016-02-16 09:55:23 -08:00
Dan Walsh 443ada574d Only relabel /var/lib/docker on initial install
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-02-16 08:27:59 -05:00
Sebastiaan van Stijn 48d4e2d953 Merge pull request #20352 from glensc/x-bit
add execute bit to contrib/report-issue.sh
2016-02-16 12:52:30 +01:00
Elan Ruusamäe 5b62b71093 add execute bit to contrib/report-issue.sh
Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
2016-02-16 12:55:15 +02:00
Sebastiaan van Stijn 3004c61865 Merge pull request #20341 from MichaelCurrie/patch-1
Fix typo
2016-02-16 11:16:29 +01:00
Sebastiaan van Stijn 957bdd9df9 Merge pull request #20343 from HackToday/fixpara
Fix the typo
2016-02-16 11:14:57 +01:00
Kai Qiang Wu(Kennan) c33cdf9ee3 Fix the typo
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-16 07:00:01 +00:00
Michael Currie 765880a46a Fix typo
Signed-off-by: MichaelCurrie <mcurrie@bruceforceresearch.com>
2016-02-16 02:51:40 +00:00
Vincent Demeester b16536aeb5 Merge pull request #20336 from robert-wallis/docs-run-typo
Fixing mismatched network name.
2016-02-15 22:32:31 +01:00
Robert Wallis 8779a4ca62 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>
2016-02-15 13:17:05 -08:00
Vincent Demeester e5a79c5d99 Merge pull request #20330 from thaJeztah/docs-typos
Fix documentation typos
2016-02-15 16:58:49 +01:00
Sebastiaan van Stijn 7da5784b10 Fix documentation typos
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-15 15:46:56 +01:00
Shijiang Wei 1e0f1ec525 optimize pubsub.Publish function
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-02-15 19:25:21 +08:00
Shijiang Wei b1594c59f5 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>
2016-02-15 19:25:16 +08:00
Aleksa Sarai 284d9d451e 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>
2016-02-15 20:36:29 +11:00
Aleksa Sarai 4bf7a84c96 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>
2016-02-15 20:36:07 +11:00
Vincent Demeester 46a61b7240 Merge pull request #20257 from Microsoft/10662-TestBuildCI6
Sixth set of TestBuild CI Enabling for Windows
2016-02-14 10:35:27 +01:00
Shijiang Wei 05b05a358f request a new token before downloading each layer
Fixes #20069

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-02-14 16:56:07 +08:00
Darren Stahl 5fc0de2688 Sixth set of TestBuild CI Enabling for Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-02-13 20:54:59 -08:00
Brian Goff 389a38e1e5 Merge pull request #20281 from FrederikNS/master
Fish tab completion lists all containers on "docker rm -f"
2016-02-13 15:41:52 -05:00
Vincent Demeester 7d9532552b Merge pull request #20280 from rhuss/patch-2
Add network mode `none` to list of possible values
2016-02-13 14:21:27 +01:00
Roland Huß c80b36c938 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>
2016-02-13 10:00:51 +01:00
Antonio Murdaca 5a9a435d40 Merge pull request #20290 from calavera/fix_stop_signal_merge
Inherit StopSignal from Dockerfile.
2016-02-13 09:26:11 +01:00
Jess Frazelle b384fd6b1b Merge pull request #20141 from cmehay/power8
Build golang 1.6 in power8 Dockerfile
2016-02-12 20:36:57 -05:00
Tianon Gravi beade8276a Merge pull request #20293 from jfrazelle/fix-release-script
dont clean the db
2016-02-12 16:30:00 -08:00
Jess Frazelle 79edcc5172 Merge pull request #20198 from cpuguy83/check_drivers_b4_vol_create
Check drivers before vol create
2016-02-12 18:41:48 -05:00
Jess Frazelle 64a4605892 Merge pull request #20278 from aaronlehmann/build-authconfig
Pass authentication credentials through to build
2016-02-12 18:37:49 -05:00
Sebastiaan van Stijn 4fea2be134 Merge pull request #20284 from Microsoft/jjh/testunit-pkgarchivestep1
Windows CI: test-unit pkg\archive step 1
2016-02-13 00:37:17 +01:00
David Calavera bda194491e Merge pull request #20287 from duglin/DebugVerCheck
Lower warning about old client to a debug
2016-02-12 15:34:02 -08:00
David Calavera a252516ec1 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>
2016-02-12 17:56:40 -05:00
Jessica Frazelle 477e1fc989
dont clean the db
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-12 13:13:50 -08:00
David Calavera b734d0e8cc Merge pull request #20285 from moxiegirl/fix-user-guide
Update the userguide to fix user feedback
2016-02-12 11:07:03 -08:00
Jess Frazelle 94b0a6b2d9 Merge pull request #20277 from tiborvass/pgp-mit-fallback
Add pgp.mit.edu fallback in Dockerfile
2016-02-12 13:56:11 -05:00
Doug Davis 059ad5d0a9 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>
2016-02-12 10:53:40 -08:00
Aaron Lehmann 6fed46aeb9 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>
2016-02-12 10:50:16 -08:00
Frederik Nordahl Jul Sabroe 2541a23c3a Fish completion lists all containers on "docker rm -f"
Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
2016-02-12 19:14:35 +01:00
John Howard 1a714e76a2 Windows CI: test-unit pkg\archive step 1
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-12 10:13:44 -08:00
Mary Anthony bf76b1d686 Update the userguide to fix user feedback
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-12 10:08:59 -08:00
David Calavera 3a3c953806 Merge pull request #20266 from npcode/fix-docs-dockernetworks-three-options
Fix an erratum; s/two/three/
2016-02-12 09:58:48 -08:00
Tibor Vass 91cdadf37e Add pgp.mit.edu fallback in Dockerfile
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 11:54:47 -05:00
Vincent Demeester c312eab74e Merge pull request #20265 from rhuss/patch-1
Fix some formatting
2016-02-12 17:23:17 +01:00
Morgan Bauer fffff202fc Merge pull request #20261 from tophj-ibm/change-test-to-use-variable
Change integration test to use declared variable
2016-02-12 07:52:51 -08:00
Yi EungJun 8c93958fcb Fix an erratum; s/two/three/
There are three options because the new one was added at 6f863cf.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-02-13 00:14:35 +09:00