Mazz Mosley
|
3906bd067e
|
Remove redundant import
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
|
2015-07-01 15:58:10 +01:00 |
|
Aanand Prasad
|
63941b8f6c
|
Add Mazz to MAINTAINERS
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-07-01 15:38:07 +01:00 |
|
Aanand Prasad
|
75600e37ad
|
Merge pull request #1605 from sdurrheimer/zsh-help-completion
Add --help to subcommands in zsh completion
|
2015-07-01 12:36:25 +01:00 |
|
Andy Wendt
|
8197d0e261
|
Added uninstall documentation for pip and curl
Signed-off-by: Andy Wendt <andy@awendt.com>
|
2015-06-30 10:27:44 -06:00 |
|
Steve Durrheimer
|
745e838673
|
Add --help to subcommands in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
|
2015-06-26 09:00:47 +02:00 |
|
Daniel Nephin
|
8346186469
|
Merge pull request #1603 from albers/completion-help-option
Add --help to bash completion
|
2015-06-25 17:59:06 -07:00 |
|
Harald Albers
|
9a8020d1bf
|
Add --help to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
|
2015-06-25 14:04:03 -07:00 |
|
Aanand Prasad
|
bee65e8354
|
Merge pull request #1587 from aanand/fix-detached-description
Fix -d description
|
2015-06-23 08:36:02 -07:00 |
|
Aanand Prasad
|
104568b27b
|
Merge branch 'compose-swarm-networking-guide'
|
2015-06-22 08:44:52 -07:00 |
|
Aanand Prasad
|
52975eca6f
|
Fixes
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-22 08:44:41 -07:00 |
|
Aanand Prasad
|
cd47829f3d
|
Merge pull request #1588 from aanand/bump-1.3.1
Bump 1.3.1
|
2015-06-22 08:01:13 -07:00 |
|
Aanand Prasad
|
4647875408
|
Merge pull request #1589 from aanand/compose-swarm-networking-guide
Add experimental Compose/Swarm/multi-host networking guide
|
2015-06-22 07:59:17 -07:00 |
|
Aanand Prasad
|
16213dd493
|
Add experimental Compose/Swarm/multi-host networking guide
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-22 07:58:08 -07:00 |
|
Aanand Prasad
|
4d4ef4e0b3
|
Bump 1.3.1
1.3.1
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 17:32:36 -07:00 |
|
Aanand Prasad
|
882ef2ccd8
|
Merge pull request #1578 from aanand/fix-migrate-help
Fix 'docker-compose help migrate-to-labels'
(cherry picked from commit c8751980f9)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 17:28:18 -07:00 |
|
Aanand Prasad
|
d6cd76c3c1
|
Merge pull request #1570 from aanand/fix-build-pull
Explicitly set pull=False when building
(cherry picked from commit 4f83a18912)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 17:28:09 -07:00 |
|
Ben Firshman
|
bd0be2cdc7
|
Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified
Don't set network mode when none is specified
(cherry picked from commit 911cd60360)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 17:27:59 -07:00 |
|
Aanand Prasad
|
c8751980f9
|
Merge pull request #1578 from aanand/fix-migrate-help
Fix 'docker-compose help migrate-to-labels'
|
2015-06-21 17:25:52 -07:00 |
|
Aanand Prasad
|
4f83a18912
|
Merge pull request #1570 from aanand/fix-build-pull
Explicitly set pull=False when building
|
2015-06-21 17:25:46 -07:00 |
|
Aanand Prasad
|
52c19bf96c
|
Fix -d description
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 13:06:25 -07:00 |
|
Aanand Prasad
|
81cbf558c3
|
Merge pull request #1586 from aanand/replace-ticks-with-indent
Replace backtick code blocks with indentation
|
2015-06-21 13:03:19 -07:00 |
|
Aanand Prasad
|
511fc4a05c
|
Replace backtick code blocks with indentation
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-21 12:37:20 -07:00 |
|
Ben Firshman
|
911cd60360
|
Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified
Don't set network mode when none is specified
|
2015-06-19 16:01:04 -07:00 |
|
Aanand Prasad
|
93372dd665
|
Fix 'docker-compose help migrate-to-labels'
- Fix "No such command" error
- Add text from migration section of install docs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-19 15:43:53 -07:00 |
|
Aanand Prasad
|
c22cc02df5
|
Don't set network mode when none is specified
Setting a value overrides the new default network option.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-19 15:22:13 -07:00 |
|
Aanand Prasad
|
37ee6b0c19
|
Merge pull request #1575 from moxiegirl/fix-yaml-code
Updating from three ticks to code block
|
2015-06-19 11:55:57 -07:00 |
|
Aanand Prasad
|
efee2df310
|
Merge pull request #1572 from sdurrheimer/fix-completion-docs-urls
Fix completion docs URLs
|
2015-06-19 11:42:39 -07:00 |
|
Steve Durrheimer
|
d0102f0761
|
Fix completion docs URLs
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
|
2015-06-19 17:57:18 +02:00 |
|
Mary Anthony
|
c3df62472b
|
Updating from three ticks to code block
Signed-off-by: Mary Anthony <mary@docker.com>
|
2015-06-19 02:28:09 -07:00 |
|
Aanand Prasad
|
bef0926c58
|
Explicitly set pull=False when building
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 17:43:16 -07:00 |
|
Daniel Nephin
|
c7c88bb4ff
|
Merge pull request #1566 from aanand/bump-1.4.0dev
Bump 1.4.0dev
|
2015-06-18 19:57:53 -04:00 |
|
Aanand Prasad
|
5aa82a5519
|
Bump 1.4.0dev
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 11:56:43 -07:00 |
|
Aanand Prasad
|
a8d7ebd987
|
Merge pull request #1461 from aanand/bump-1.3.0
Bump 1.3.0
|
2015-06-18 11:41:40 -07:00 |
|
Aanand Prasad
|
00f61196a4
|
Bump 1.3.0
1.3.0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 11:25:10 -07:00 |
|
Aanand Prasad
|
c21d6706b6
|
Merge pull request #1565 from aanand/use-docker-1.7.0
Use docker 1.7.0 and docker-py 1.2.3
(cherry picked from commit 8ffeaf2a54)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Conflicts:
Dockerfile
|
2015-06-18 11:25:10 -07:00 |
|
Aanand Prasad
|
c3c5d91c47
|
Merge pull request #1563 from moxiegirl/hugo-test-fixes
Hugo final 1.7 Documentation PR -- please read carefully
(cherry picked from commit 4e73e86d94)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 11:25:10 -07:00 |
|
Aanand Prasad
|
8ffeaf2a54
|
Merge pull request #1565 from aanand/use-docker-1.7.0
Use docker 1.7.0 and docker-py 1.2.3
|
2015-06-18 11:23:40 -07:00 |
|
Aanand Prasad
|
ac56ef3d65
|
Update docker-py to 1.2.3 final
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 11:11:51 -07:00 |
|
Aanand Prasad
|
ae96e1af16
|
Use Docker 1.7.0
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-18 10:34:34 -07:00 |
|
Aanand Prasad
|
4e73e86d94
|
Merge pull request #1563 from moxiegirl/hugo-test-fixes
Hugo final 1.7 Documentation PR -- please read carefully
|
2015-06-18 10:20:10 -07:00 |
|
Mary Anthony
|
c26b1c8ee9
|
Entering fixes from Hugo
renaming compose-overview back to index
Updating with fixes per Aanand. And others found through test
Signed-off-by: Mary Anthony <mary@docker.com>
|
2015-06-17 21:50:43 -07:00 |
|
Aanand Prasad
|
77c939b256
|
Merge pull request #1142 from calou/master
Added support of option mac-address
|
2015-06-17 14:39:00 -07:00 |
|
Sébastien Gruchet
|
b76ac6e633
|
Added support to option mac-address
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Updated doc
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Fixed LINT errors
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed mac-address entry order in config keys
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed attributes order in docs/yml.md
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
|
2015-06-17 21:28:17 +02:00 |
|
Daniel Nephin
|
26ea27172e
|
Merge pull request #1558 from aanand/use-docker-1.7-rc4
Use Docker 1.7 RC5
|
2015-06-16 22:01:50 -04:00 |
|
Aanand Prasad
|
7fa4cd1214
|
Merge pull request #1552 from aanand/add-upgrade-instructions
Add upgrading instructions to install docs
(cherry picked from commit bc7161b475)
|
2015-06-16 16:29:18 -07:00 |
|
Aanand Prasad
|
bc7161b475
|
Merge pull request #1552 from aanand/add-upgrade-instructions
Add upgrading instructions to install docs
|
2015-06-16 16:26:40 -07:00 |
|
Aanand Prasad
|
e0af1a44ea
|
Use Docker 1.7 RC5
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
|
2015-06-16 15:14:48 -07:00 |
|
Aanand Prasad
|
bc14c473c9
|
Merge pull request #1521 from dano/validate-service-names
Validate that service names passed to Project.containers aren't bogus.
|
2015-06-16 10:45:49 -07:00 |
|
Dan O'Reilly
|
464ab3d727
|
Add a method specifically for service name validation.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
|
2015-06-15 23:06:06 -04:00 |
|
Daniel Nephin
|
f3df2a9fec
|
Merge pull request #1551 from aanand/use-docker-1.7-rc3
Use Docker 1.7 RC3
|
2015-06-15 21:33:07 -04:00 |
|