Jean-Laurent de Morlhon
6511c9a45a
Merge pull request #2731 from Akasurde/patch_1
...
Updated documentation for bash completion in install-machine
2016-01-04 15:15:37 +01:00
Jean-Laurent de Morlhon
db07b70a66
Merge pull request #2724 from hypriot/improve-detect-shell-on-windows
...
Auto-detect shell on Windows
2016-01-04 15:11:33 +01:00
David Gageot
85405468de
Fix the vbox sample code
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 14:59:25 +01:00
David Gageot
263f8c5cdd
Remove duplication
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 14:59:25 +01:00
David Gageot
00eee7db1d
Simplify Api
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 14:59:25 +01:00
David Gageot
67f8b19c9b
Don't use global variables. Make the Api closeable
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 14:59:15 +01:00
David Gageot
3990815e10
FIX #2688 - Run docker-machine from the PATH for core drivers
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 14:50:04 +01:00
David Gageot
d8fb917cd8
FIX #2703 Update dockerclient
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 11:33:33 +01:00
Wen Cheng Ma
d92d1de3d5
Update docker network api doc
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-01-04 18:05:02 +08:00
Abhijeet Kasurde
18e4081160
Updated documentation for bash completion in install-machine
...
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com >
2016-01-04 15:20:37 +05:30
David Gageot
5cfdcfe7b6
Remove duplication on certificates code
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:40:21 +01:00
David Gageot
885c37e536
Use accessor
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:40:12 +01:00
David Gageot
9354fed274
Remove some duplication related to swarm
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:40:04 +01:00
David Gageot
2b96c0656d
Dead code
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:39:52 +01:00
David Gageot
6f53a0b9ed
Simpler code
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:39:38 +01:00
David Gageot
855de0741a
Logs for Kill
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:38:25 +01:00
David Gageot
e9aa75f021
Logs for Restart
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:38:25 +01:00
David Gageot
783d2b124e
Logs for Start
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:38:25 +01:00
David Gageot
bbe76b5a26
Logs for Stop
...
Signed-off-by: David Gageot <david@gageot.net >
2016-01-04 10:38:25 +01:00
Jean-Laurent de Morlhon
e2c4801a93
Merge pull request #2716 from dweomer/swarm-provisioning-fix-restart-policy-2715
...
fix swarm provision issue #2715 : invalid restart policy
2016-01-04 10:24:24 +01:00
Jean-Laurent de Morlhon
c115e037da
Merge pull request #2725 from albers/patch-1
...
Fix "installing bash completion" instructions
2016-01-04 10:22:33 +01:00
Sven Dowideit
a580dae06f
Merge pull request #1310 from thaJeztah/fix-hugo-linting
...
docs: mark manifest as "draft"
2016-01-04 18:44:11 +10:00
Harald Albers
54d0e43914
Fix "installing bash completion" instructions
...
The scripts are copied/linked into a _directory_, not a file.
The two directories are the default locations for bash completion extensions.
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-04 09:15:45 +01:00
Sebastiaan van Stijn
db738dd77f
Merge pull request #15666 from vdemeester/3519-configurable-escape
...
Implement configurable escape key for attach/exec
2016-01-04 00:49:07 +01:00
Vincent Demeester
15aa2a663b
Implement configurable detach key
...
Implement configurable detach keys (for `attach`, exec`, `run` and
`start`) using the client-side configuration
- Adds a `--detach-keys` flag to `attach`, `exec`, `run` and `start`
commands.
- Adds a new configuration field (in `~/.docker/config.json`) to
configure the default escape keys for docker client.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2016-01-03 23:03:39 +01:00
Sebastiaan van Stijn
2916ceb313
Merge pull request #19037 from moxiegirl/15666-file-carry
...
Creating a man page for the configuration file
2016-01-03 22:50:32 +01:00
Ingo Gottwald
f8c5420080
Fix race condition in JSONFileLogger.Log
...
Signed-off-by: Ingo Gottwald <in.gottwald@gmail.com >
2016-01-03 22:45:56 +01:00
Mary Anthony
32b5f71f0d
Creating a man page for the configuration file
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding comments. Fixing bit in daemon
Signed-off-by: Mary Anthony <mary@docker.com >
Arrrgggh
Signed-off-by: Mary Anthony <mary@docker.com >
2016-01-03 13:23:18 -08:00
Sebastiaan van Stijn
9d6c2196b5
Merge pull request #18387 from wenchma/18385-improve_help_msg
...
Improvement for docker subcommand's help messages
2016-01-03 12:19:53 +01:00
Stefan Scherer
d394cffe49
Auto-detect shell on Windows
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
2016-01-03 03:35:12 +01:00
Tianon Gravi
29da9903d4
Merge pull request #19035 from albers/completion-authorization-plugins
...
Compute plugin list in bash completion for `docker daemon --authz-plugin`
2016-01-02 18:21:19 -08:00
Phil Estes
233787040c
Merge pull request #19036 from calavera/thank_you_ian
...
Thanks for everything Ian.
2016-01-02 21:21:03 -05:00
David Calavera
e11ebfcb09
Add Ian Murdock to the names generator.
...
❤️ 😢
Signed-off-by: David Calavera <david.calavera@gmail.com >
2016-01-02 19:17:17 -05:00
Alexandre Vazquez
83c1940741
Merge branch 'master' of https://github.com/docker/kitematic
2016-01-03 01:07:11 +01:00
Harald Albers
2134d38935
Compute plugin list in bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
2016-01-02 14:53:10 -08:00
Lukas Waslowski
9a03967f0a
Fix declarations of of execdriver/native.NewDriver to have the same signature.
...
This change is done so that driver_unsupported.go and driver_unsupported_nocgo.go
declare the same signature for NewDriver as driver.go.
Fixes #19032
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com >
2016-01-02 19:55:37 +01:00
Jeffrey Morgan
1b9a0484c0
Fix bug where entry point would be repeated if no CMD was specified
2016-01-01 21:18:10 -05:00
Sebastiaan van Stijn
dcbd5e04b7
Merge pull request #18891 from HackToday/18872-fix-volume-cmd
...
Fix the restore data example
2016-01-02 00:43:46 +01:00
Vincent Demeester
1a5b97c761
Merge pull request #18932 from wenchma/same_name_of_container_image
...
Update integration tests when container and image have same name
2016-01-01 21:40:51 +01:00
Arnaud Porterie
c431bcba5b
Merge pull request #19028 from AvdN/patch-1
...
fix typo
2016-01-01 12:26:44 -08:00
Arnaud Porterie
838e4c86e8
Merge pull request #19027 from runcom/remove-getter
...
daemon: info: remove exported getter
2016-01-01 12:26:24 -08:00
Vincent Demeester
3544d48ca1
Merge pull request #19019 from duglin/constScratch
...
Use constant instead of "scratch"
2016-01-01 21:02:41 +01:00
Anthon van der Neut
b4d4a805ea
fix typo
...
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu >
2016-01-01 20:39:04 +01:00
Antonio Murdaca
77ef3a606a
daemon: info: remove exported getter
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-01-01 20:22:29 +01:00
Vincent Demeester
5c0af43ebe
Merge pull request #19006 from jen20/f-solaris-stat
...
Fix downstream client API build errors on Solaris
2016-01-01 20:09:22 +01:00
Arnaud Porterie
e7c6206574
Merge pull request #19007 from aboch/npe
...
Properly initialize IpamConf structure in initBridgeDriver
2016-01-01 10:50:54 -08:00
Wen Cheng Ma
d7dc439623
Improvement for docker subcommand's help messages
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
2016-01-01 12:27:28 +08:00
Mary Anthony
d4e913e42c
Fixing TODO visible in docs
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-12-31 19:04:38 -08:00
Brian Goff
e7e3e568d1
Merge pull request #18836 from vdemeester/18829-info-authz-plugins
...
Add authorization plugins to docker info
2015-12-31 09:47:59 -05:00
Doug Davis
e6806223e8
Use constant instead of "scratch"
...
Move NoBaseImageSpecifier to a common spot and then use it instead of
"scratch" in a couple of places.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-12-31 06:21:56 -08:00