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
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
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
eae59c4226
Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow
...
Fix flaky TestLogsSinceFutureFollow
2016-02-16 15:23:19 -08:00
c795d0bab9
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
2016-02-16 15:01:17 -08:00
c66d9f5627
Merge pull request #20373 from bastiaanb/fix/docs-trailing-slash-in-dockerfile-copy-example
...
add missing trailing slash in ADD and COPY /absoluteDir examples.
2016-02-16 23:10:47 +01:00
0f5624d374
Merge pull request #20367 from tonistiigi/fix-import-gzip
...
Fix docker import on compressed data
2016-02-16 14:09:46 -08:00
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
f982f08c50
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>
2016-02-16 22:52:16 +01:00
4928121992
Fix flaky TestLogsSinceFutureFollow
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-02-16 13:49:44 -08:00
3fe60bbf95
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com>
2016-02-16 13:24:49 -08:00
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
d445eb4808
Merge pull request #20353 from rhatdan/selinux
...
Only relabel /var/lib/docker on initial install
2016-02-16 12:15:20 -08:00
056013f97b
Fix migration diffid atomic write
...
Fixes #20267
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-16 11:51:35 -08:00
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
e8f569b324
Remove all docker debugging knowledge from the server.
...
It should be explicitly told whether to enable the profiler or not.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-16 14:11:16 -05:00
05002c2501
Add support for forwarding Docker client through SOCKS proxy
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 11:09:28 -08:00
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
15d7fa77e1
Merge pull request #20305 from cyphar/fix-apparmor-version-checks
...
Fix apparmor version checks
2016-02-16 10:11:08 -08:00
16effc66c0
Vendor new engine-api and go-connections
...
There is SOCKS5 proxy support in new versions.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-16 10:05:01 -08:00
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
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
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
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
3004c61865
Merge pull request #20341 from MichaelCurrie/patch-1
...
Fix typo
2016-02-16 11:16:29 +01:00
957bdd9df9
Merge pull request #20343 from HackToday/fixpara
...
Fix the typo
2016-02-16 11:14:57 +01:00
c33cdf9ee3
Fix the typo
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-16 07:00:01 +00:00
765880a46a
Fix typo
...
Signed-off-by: MichaelCurrie <mcurrie@bruceforceresearch.com>
2016-02-16 02:51:40 +00:00
b16536aeb5
Merge pull request #20336 from robert-wallis/docs-run-typo
...
Fixing mismatched network name.
2016-02-15 22:32:31 +01:00
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
adb2e3fedc
/dev/mqueue should never be mounted readonly
...
If user specifies --read-only flag it should not effect /dev/mqueue.
This is causing SELinux issues in docker-1.10. --read-only blows up
on SELinux enabled machines. Mounting /dev/mqueue read/only would also
blow up any tool that was going to use /dev/mqueue.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-02-15 14:56:07 -05:00
e5a79c5d99
Merge pull request #20330 from thaJeztah/docs-typos
...
Fix documentation typos
2016-02-15 16:58:49 +01:00
7da5784b10
Fix documentation typos
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-02-15 15:46:56 +01:00
1e0f1ec525
optimize pubsub.Publish function
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-02-15 19:25:21 +08:00
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
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
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
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
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
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
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
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
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
5a9a435d40
Merge pull request #20290 from calavera/fix_stop_signal_merge
...
Inherit StopSignal from Dockerfile.
2016-02-13 09:26:11 +01:00
f27b5dda4a
Switch Dockerfile to debian:jessie
...
Fixes broken-pipe issue when piping s3cmd to grep -q, by removing the -q
flag and redirecting to /dev/null instead.
Add net-tools for ifconfig, because some tests rely on ifconfig.
Harmonize all Dockerfiles in this direction.
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-02-12 21:49:54 -05:00
b384fd6b1b
Merge pull request #20141 from cmehay/power8
...
Build golang 1.6 in power8 Dockerfile
2016-02-12 20:36:57 -05:00
beade8276a
Merge pull request #20293 from jfrazelle/fix-release-script
...
dont clean the db
2016-02-12 16:30:00 -08:00
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
d6b7819185
Windows CI: test-unit on pkg\archive part 2
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-12 15:40:41 -08:00
64a4605892
Merge pull request #20278 from aaronlehmann/build-authconfig
...
Pass authentication credentials through to build
2016-02-12 18:37:49 -05:00
Brian Goff
HuKeping
Michael Crosby
Alexander Morozov
David Calavera
Sebastiaan van Stijn
Bastiaan Bakker
Arnaud Porterie
Cedric Davies
Jess Frazelle
Tonis Tiigi
Alexander Morozov
Vishnu kannan
Dan Walsh
Elan Ruusamäe
Kai Qiang Wu(Kennan)
Michael Currie
Vincent Demeester
Robert Wallis
Sebastiaan van Stijn
Shijiang Wei
Aleksa Sarai
Darren Stahl
Roland Huß
Antonio Murdaca
Tibor Vass
Tianon Gravi
John Howard