docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
47,845 Commits 124 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen J Day
ffd3662982 Harden basic auth implementation 
After consideration, the basic authentication implementation has been
simplified to only support bcrypt entries in an htpasswd file. This greatly
increases the security of the implementation by reducing the possibility of
timing attacks and other problems trying to detect the password hash type.

Also, the htpasswd file is only parsed at startup, ensuring that the file can
be edited and not effect ongoing requests. Newly added passwords take effect on
restart. Subsequently, password hash entries are now stored in a map.

Test cases have been modified accordingly.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-10 19:38:56 -07:00
Jana Radhakrishnan
386ab25137 Vendoring libnetwork to fix stale arp cache issue 
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-06-10 19:29:10 -07:00
Stephen J Day
ffe56ebe41 Refactor Basic Authentication package 
This change refactors the basic authentication implementation to better follow
Go coding standards. Many types are no longer exported. The parser is now a
separate function from the authentication code. The standard functions
(*http.Request).BasicAuth/SetBasicAuth are now used where appropriate.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
abd142855a Unexported function to comply with golint 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
e4c3ab4377 Removed dashes from comments, unexported htpasswd struct 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
d4f2260e04 Added dependency to golang.org/x/crypto/bcrypt 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
04f6a4811d Fixed golint, gofmt warning advice. 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
c50dfb7dae Added support for bcrypt, plaintext; extension points for other htpasswd hash methods. 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
c4849bb99a Aligned formatting with gofmt 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
Dave Trombley
0ecaa7f40a Fixed WWW-Authenticate: header, added example config and import into main, fixed golint warnings 
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:38 -07:00
BadZen
8a204f59e7 Implementation of a basic authentication scheme using standard .htpasswd files 
Signed-off-by: BadZen <dave.trombley@gmail.com>
Signed-off-by: Dave Trombley <dave.trombley@gmail.com>
 2015-06-10 19:06:37 -07:00
Sean Li
77afa027fe Better button style. 2015-06-10 17:53:09 -07:00
Sean Li
00cf90d871 Working buttons. 2015-06-10 17:42:14 -07:00
Olivier Gambier
7363323321 Merge pull request #612 from HuKeping/addtest-httpchecker 
Test: add test for HTTPChecker
 2015-06-10 17:08:55 -07:00
Arnaud Porterie
883d661b69 Merge pull request #13867 from calavera/fix_daemon_cleanup_order 
Cleanup driver and graph db after stopping containers.
 2015-06-10 17:05:41 -07:00
Victor Vieux
52db3436a2 add ttl placeholder to discovery 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2015-06-10 17:03:48 -07:00
David Calavera
ad9080a87c Merge pull request #13868 from jfrazelle/update-gitignore-man 
update gitignore for new manpages
 2015-06-10 16:55:15 -07:00
Josh Hawn
0cdc3b7539 api/client: have cli.call() return headers 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-10 16:20:13 -07:00
Jeffrey Morgan
7256065ca1 Minor bugfixes 2015-06-10 16:20:01 -07:00
Josh Hawn
4cb0c93f92 api/client: Allow for multi-line usage help 
Subcommands can provide multiple usage synopses.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-06-10 16:14:45 -07:00
David Calavera
0964a664e8 Cleanup driver and graph db after stopping containers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-10 16:11:50 -07:00
Jessica Frazelle
f88e620359 update gitignore for new manpages 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-10 16:11:15 -07:00
Mary Anthony
d8d673bf24 Closes #1329 when merged 
Updating links
Updating with the comments from the team

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-10 16:09:30 -07:00
Doug Davis
466efebf0e Merge pull request #13863 from Microsoft/typoclientutils 
Typo fix in api\client\utils.go
 2015-06-10 15:57:37 -07:00
Sean Li
6aa1cd6a1b Details page style improvement. 2015-06-10 15:49:01 -07:00
Jeffrey Morgan
c722a933d6 Add stdout to exec errors 2015-06-10 15:40:50 -07:00
John Howard
84aec1e8e6 Typo fix in api\client\utils.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 15:24:53 -07:00
John Howard
141cd2a1f2 Show actual number of elements restored 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 15:18:51 -07:00
David Calavera
b6049b5c49 Merge pull request #13804 from moxiegirl/proposal-man-pages 
PROPOSAL: Moving man pages out of docs
 2015-06-10 15:04:19 -07:00
Vincent Demeester
a5fd91c705 Fixing docker-compose port with scale (#667) 
Fixes #667 and Closes #735 (taking over it)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-06-10 23:26:33 +02:00
Aanand Prasad
0e9ccd36f3 Merge pull request #1497 from aanand/use-1.7-rc1 
Run tests against Docker 1.7 RC2
 2015-06-10 17:19:24 -04:00
Arnaud Porterie
9da65ed84f Merge pull request #13854 from crosbymichael/revert-shared-root 
Revert shared container rootfs
 2015-06-10 14:12:14 -07:00
Nathan LeClaire
061f865c3e Merge pull request #1341 from ehazlett/windows-prompt-for-env 
windows: error message if using powershell/cmd and none specified
 2015-06-10 13:49:21 -07:00
Mary Anthony
eacae64bd8 Moving man pages out of docs 
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-10 13:43:35 -07:00
Tibor Vass
add64dc297 Merge pull request #13832 from mapk0y/fix-error-msg 
fix typo.
 2015-06-10 16:38:07 -04:00
Brian Goff
05644ccea9 Merge pull request #13272 from Microsoft/10662-daemonrefactorv2 
Windows: Refactor daemon
 2015-06-10 16:28:56 -04:00
David Calavera
17324c91e3 Merge pull request #13015 from mariussturm/master 
Add logging driver for GELF via UDP
 2015-06-10 12:45:12 -07:00
John Howard
8fb0ca2c35 Windows: Refactor daemon 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 12:42:43 -07:00
Jessie Frazelle
65d0670d65 Merge pull request #13853 from jfrazelle/fix-hack-make 
ugh typo in hack scripts fix, introduced by 2b4facdf
 2015-06-10 11:53:47 -07:00
Michael Crosby
c9d71317be Revert shared container rootfs 
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-06-10 11:29:27 -07:00
Victor Vieux
91b599407f Merge pull request #926 from Pensu/fix-stress-test 
Fixing errors in stress test
 2015-06-10 11:28:57 -07:00
Sean Li
2c2f34f553 Icon sizing fixes. 2015-06-10 11:27:05 -07:00
Sean Li
5057ab5fa9 Icons for show more menu. 2015-06-10 11:22:58 -07:00
Marius Sturm
96d06e106f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
 2015-06-10 20:21:50 +02:00
Aanand Prasad
4fd5d58076 Test against Docker 1.7.0 RC2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-10 14:19:36 -04:00
Sean Li
c5f093f8cb JSHINT. 2015-06-10 11:12:47 -07:00
Sean Li
362a76a8b3 Improved fonts. 2015-06-10 11:06:16 -07:00
Jessica Frazelle
c5f49886fa ugh typo in hack scripts fix, introduced by 2b4facdf 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-10 11:00:59 -07:00
Jeffrey Morgan
307f57416b Fix checking for expired token 2015-06-10 10:40:03 -07:00
Jeffrey Morgan
e61773d185 Bumping version to 0.6.4 2015-06-10 10:34:19 -07:00