Alexander Morozov
eae59c4226
Merge pull request #20374 from icecrime/20357_test_logs_since_future_follow
...
Fix flaky TestLogsSinceFutureFollow
2016-02-16 15:23:19 -08:00
David Calavera
c795d0bab9
Merge pull request #19689 from cednation/etwlogs
...
Windows: Add ETW logging driver plug-in
2016-02-16 15:01:17 -08:00
Carol Fager-Higgins
bbd728af16
removed tutorial repo
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
2016-02-16 14:49:26 -08:00
Riyaz Faizullabhoy
4044a37613
ignore git files in misspell
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 14:36:57 -08:00
Sebastiaan van Stijn
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
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
Riyaz Faizullabhoy
4258ebeb34
add to circle ci
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 13:55:14 -08:00
Bastiaan Bakker
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
Riyaz Faizullabhoy
a0cd58655f
add misspell target to makefile
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 13:50:20 -08:00
Arnaud Porterie
4928121992
Fix flaky TestLogsSinceFutureFollow
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2016-02-16 13:49:44 -08:00
Daniel Nephin
471264239f
Update guides to use v2 config format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-16 16:43:26 -05:00
Daniel Nephin
4de12ad7a1
Update link to docker volume create docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-02-16 16:43:22 -05:00
Riyaz Faizullabhoy
5931f93134
fix current typos
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 13:36:57 -08:00
Cedric Davies
3fe60bbf95
Windows: Add ETW logging driver plug-in
...
Signed-off-by: Cedric Davies <cedricda@microsoft.com >
2016-02-16 13:24:49 -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
Richard Scothern
56af60ad24
To avoid any network use unless necessary, delay establishing authorization
...
challenges with the upstream until any proxied data is found not to be local.
Implement auth challenges behind an interface and add to unit tests. Also,
remove a non-sensical unit test.
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-02-16 11:53:42 -08:00
Tonis Tiigi
056013f97b
Fix migration diffid atomic write
...
Fixes #20267
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2016-02-16 11:51:35 -08:00
Joffrey F
ec3af7d491
Merge pull request #2920 from londoncalling/docs-examples
...
update to description of files generated from examples, which are no …
2016-02-16 11:51:14 -08:00
Victoria Bialas
8af0a0f85b
update to description of files generated from examples, which are no longer owned by root w/new release
...
updated descriptions of changing file ownership and images per Seb's comments
fixed line wraps
fixed line breaks per Joffrey's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
2016-02-16 11:34:59 -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
Brian Bland
b9907c4853
Merge pull request #1385 from BrianBland/s3UseAWSLibrary
...
[driver/s3] Use aws/aws-sdk-go instead of goamz for s3 driver and cloudfront
2016-02-16 11:19:15 -08:00
David Calavera
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
Alexander Morozov
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
Richard Scothern
d126752d97
Merge pull request #1462 from liuchang23/master
...
enhance log message of oss driver
2016-02-16 10:49:18 -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
Derek McGowan
98620458e3
Add credential authenticator interface
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2016-02-16 10:23:35 -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
Riyaz Faizullabhoy
b46391ee8f
Remove RoleWithKeys
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-16 10:07:00 -08:00
Alexander Morozov
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
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
Sebastiaan van Stijn
cd06890ff0
Merge pull request #57 from thaJeztah/add-leadership
...
Add docker/leadership repo
2016-02-16 18:32:25 +01:00
Sebastiaan van Stijn
4a3d4c3a03
Add docker/leadership repo
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-02-16 18:29:43 +01:00
Nishant Totla
204a51c805
Merge pull request #1822 from thaJeztah/fix-maintainers-file
...
Fix MAINTAINERS file
2016-02-16 08:45:37 -08:00
moxiegirl
b8c35e1298
Merge pull request #2884 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-16 08:09:49 -08:00
Sebastiaan van Stijn
b50c9036dd
Fix MAINTAINERS file
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-02-16 17:04:10 +01:00
Anthon van der Neut
69d0154718
reset colors after warning
...
If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`.
Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal.
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu >
2016-02-16 15:42:43 +01: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
Alexandre Vázquez
9ad51afdb5
Merge branch 'master' into issue-1369
...
# Conflicts:
# src/browser.js
2016-02-16 09:56:47 +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
Riyaz Faizullabhoy
c3c24be66b
remove path restriction from getting delegations, use in future visitor
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-15 22:38:41 -08:00
Riyaz Faizullabhoy
10865d2310
addressing review comments
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-15 22:38:41 -08:00
Riyaz Faizullabhoy
1d9e375680
add delegation role methods, more tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-15 22:38:41 -08:00
Riyaz Faizullabhoy
affd18f3d5
limit role methods
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-15 22:38:41 -08:00
Riyaz Faizullabhoy
dcbdc258c1
update the path validation
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
2016-02-15 22:38:41 -08:00