Diogo Mónica
5490ece809
Merge pull request #56 from dmcgowan/fix-timestamp-algorithm
...
Change fallback timestamp algorithtm to supported version
2015-07-14 15:39:48 -07:00
Jessica Frazelle
24bb36297c
update urls for rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-14 15:26:11 -07:00
Victor Vieux
248370469f
add hostname support
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-14 15:25:38 -07:00
David Calavera
b49cbe289f
Bump version to 1.8.0-dev.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-14 15:24:48 -07:00
David Calavera
2932069dc7
Bump to version 1.7.1
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-14 15:23:55 -07:00
David Calavera
ecdbf86884
Merge pull request #13694 from vdemeester/opts-test-coverage
...
Tests, refactor and coverage on package opts
2015-07-14 15:09:48 -07:00
Victor Vieux
b3385caa4e
add env support in mesos
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-14 14:47:47 -07:00
Victor Vieux
ef2d11899a
Merge pull request #1058 from vieux/add_events
...
add events to mesos and a few tests
2015-07-14 14:40:24 -07:00
Diogo Mónica
eb8e868e6d
Merge pull request #53 from docker/import-notary-signer
...
Import notary signer, refactor notary-signer API again
2015-07-14 14:33:10 -07:00
Nathan McCauley
79af8434d3
exclude proto gen'd code from go fmt during circle ci
...
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com >
2015-07-14 14:21:52 -07:00
Victor Vieux
f00e6aa967
add events to mesos and a few tests
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2015-07-14 14:20:17 -07:00
Nathan McCauley
40fd60264a
exclude proto gen'd code from go fmt
...
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com >
2015-07-14 14:13:19 -07:00
Derek McGowan
93dc0285bc
Add ping endpoint
...
Ping endpoint added so clients can get the list of authentication challenges before making an initial request.
Updated MainHandler to return JSON object instead of a string.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-14 14:08:12 -07:00
Aaron Lehmann
c82440258f
Add documentation for FindKeyByID function
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-14 14:06:52 -07:00
Jessie Frazelle
4e9280ffdb
Merge pull request #14304 from vieux/http_proxy_support
...
add support for base path in docker cli -H
2015-07-14 13:21:51 -07:00
Vincent Demeester
5c295460da
Use dockerCmd when possible ( #14603 )
...
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go
- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-14 21:52:43 +02:00
Mary Anthony
39806c02e0
First stage of splitting out
...
Splitting out docs
Fixing location of help
entering in changes from testing
Filling in some missing structure
Updating with the comments from Nathan
Updating with the comments from Nathan
Updating after talk with Evan/Nathan
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-14 12:44:56 -07:00
Michael Chiang
7d7bdb7728
Fix Toolbox welcome.html. Not engine but client.
...
Engine -> Client
2015-07-14 12:26:22 -07:00
Michael Chiang
616181b6f8
OSX Readme.MD change - removing boot2docker references
...
OSX Readme.MD change - removing boot2docker references
2015-07-14 12:26:22 -07:00
Michael Chiang
be5f0dee61
Fix version name ENV
...
Fix version name ENV
2015-07-14 12:26:22 -07:00
Phil Estes
d2fe5bd12f
Merge pull request #14618 from hqhq/hq_add_check_for_swappiness
...
Add hostConfig check for MemorySwappiness
2015-07-14 15:24:50 -04:00
Jeffrey Morgan
2137536624
Merge branch 'master' of github.com:docker/toolbox
2015-07-14 12:12:15 -07:00
Jeffrey Morgan
36208ddefb
Remove unnecessary restart task at end of install
2015-07-14 12:12:09 -07:00
Jeffrey Morgan
24c1d3084e
t pMerge branch 'master' of github.com:docker/toolbox
2015-07-14 12:03:35 -07:00
Jeffrey Morgan
f39bcde25b
Add Docs
2015-07-14 12:02:37 -07:00
Jeffrey Morgan
a9a1a50124
Merge branch 'master' of github.com:docker/toolbox
2015-07-14 12:02:33 -07:00
Jeffrey Morgan
e6ee48a88f
Add docs
2015-07-14 12:02:30 -07:00
Jeffrey Morgan
6f9751d618
Fix windows start script
2015-07-14 12:00:51 -07:00
Nathan LeClaire
70238f79ad
Merge pull request #1300 from hairyhenderson/restart-suggest-rerun-env-1298
...
Warning user that the active machine was restarted and may have a new IP
2015-07-14 11:52:51 -07:00
Sean Li
2940c98332
Uses dev instead of docker-vm.
2015-07-14 11:50:10 -07:00
Victor Vieux
8e999214fb
Merge pull request #1052 from gonkulator/master
...
Grammar regarding least and fewest
2015-07-14 11:49:24 -07:00
Victor Vieux
8935c892c3
Merge pull request #1054 from tombenner/fix_typo
...
Fix small typo ("an"/"ran") in installation docs
2015-07-14 11:48:59 -07:00
Sean Li
90317c762d
Merge remote-tracking branch 'origin/master'
2015-07-14 11:48:31 -07:00
Sean Li
8f8e385daf
Merge remote-tracking branch 'origin/master'
...
Conflicts:
site/static/css/main.css
site/static/less/layout.less
2015-07-14 11:48:29 -07:00
Jeffrey Morgan
7291c75daa
Fix env loading on mac os x
2015-07-14 11:46:58 -07:00
Derek McGowan
3971955cfe
Change fallback timestamp algorithtm to supported version
...
ECDSA timestamp keys currently not supported by crypto service, use support ED25519.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-14 11:44:50 -07:00
Sean Li
75ee11b1c9
Deleted Swarm and centered included items.
2015-07-14 11:44:32 -07:00
Erik Kristensen
7937611366
change 80 to 0
...
Signed-off-by: Erik Kristensen <erik@erikkristensen.com >
2015-07-14 12:31:00 -06:00
Erik Kristensen
b7edb3ca9d
do not wrap table cells
...
Signed-off-by: Erik Kristensen <erik@erikkristensen.com >
2015-07-14 12:30:42 -06:00
Richard Scothern
7e6fda610d
Fix build when using build tag 'noresumabledigest'
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-07-14 11:14:09 -07:00
Razzi Abuissa
0c0bb49154
Fix some typos and minor grammatical issues
2015-07-14 11:06:05 -07:00
Victor Vieux
113601341a
Merge pull request #1056 from rmg/preserve-exec-status
...
preserve status code from POST /containers/*/exec
2015-07-14 10:51:19 -07:00
Aaron Lehmann
e7e9ef4a0d
Don't hardcode RSA algorithm
...
When we need to find a key from its ID, search all available signing
services. There should only be a few, so this shouldn't have much
overhead. This avoids the need to maintain a persistent mapping between
key ID and the responsible signing service.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-14 10:49:43 -07:00
Brian Goff
e5fa2a740d
Merge pull request #14629 from LK4D4/pubsub_timer_off
...
pkg/pubsub: Don't use time.After if there is no timeout
2015-07-14 13:06:57 -04:00
Aanand Prasad
c3c5b354b8
Merge pull request #1690 from aanand/bump-1.3.2
...
Bump 1.3.2
2015-07-14 18:04:22 +01:00
Aanand Prasad
95cf195dbd
Bump 1.3.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:40:43 +01:00
Sebastiaan van Stijn
899f6f2a89
Merge pull request #14252 from sallyom/docs-use-lowercase
...
Modify man pages for image-naming
2015-07-14 18:34:36 +02:00
Aanand Prasad
a80afd67ab
Merge pull request #1688 from aanand/use-docker-py-1.3.0
...
Use docker-py 1.3.0
(cherry picked from commit 1e71eebc74 )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:29:25 +01:00
Aanand Prasad
4bc4d273ac
Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers
...
Show an error on 'run' when there are legacy one-off containers
(cherry picked from commit 81707ef1ad )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-07-14 17:29:12 +01:00
Aanand Prasad
4911c77134
Merge pull request #1489 from dnephin/faster_integration_tests
...
Faster integration tests
(cherry picked from commit 5231288b4e )
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Conflicts:
compose/cli/main.py
2015-07-14 17:28:54 +01:00