tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,582 Commits 21 Branches 282 Tags
Commit Graph

4582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aanand Prasad
4d4ef4e0b3 Bump 1.3.1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.3.1 		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 c8751980f9011b22ce9d661bd051e4fee44d4adf)

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 4f83a1891259bd821efb6c8f2332f06405e88732)

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 911cd60360ceef2a4c4c4e53b661679a4f1bc48a)

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 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
1.3.0 		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 8ffeaf2a54828014834f49e9a20d9486a6d6d335)

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 4e73e86d9480de0be87fa5390d915346a435ac26)

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 bc7161b475f7032bfc36e177935e9d7b13354718)
 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
Aanand Prasad
c421d23c34 Update Swarm docs 
- Link to libnetwork

- Building now works, but is complicated by scaling

- Document how to set constraints/affinity

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 15:19:55 -07:00
Aanand Prasad
f353d9fbc0 Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
(cherry picked from commit 5b2a0cc73d104340964b299c11723e465ea7c112)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:08 -07:00
Daniel Nephin
09018855ce Merge pull request #1550 from aanand/update-docker-py 
Update setup.py with new docker-py minimum
(cherry picked from commit b3b44b8e4c7ee7463136bb13cf6c3d759e6d87e9)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:08 -07:00
Aanand Prasad
719954b02f Merge pull request #1545 from moxiegirl/test-tooling 
Updated for new documentation tooling
(cherry picked from commit aaccd12d3df2ab64f44db5c6cd8bae282a314419)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:08 -07:00
Daniel Nephin
67bc3fabe4 Merge pull request #1544 from aanand/fix-volume-deduping 
Fix volume binds de-duplication
(cherry picked from commit 77e594dc9405707ef8787728ae63ca091593f3ba)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:08 -07:00
Daniel Nephin
e724a346c7 Merge pull request #1526 from aanand/remove-start-or-create-containers 
Remove Service.start_or_create_containers()
(cherry picked from commit 38a11c4c28b1af644448d519544b876132ae89a8)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:08 -07:00
Daniel Nephin
87b4545b44 Merge pull request #1508 from thaJeztah/update-dockerproject-links 
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9f67cc719d5f3bfa9e3adbfb16a34eb)
 2015-06-15 11:22:07 -07:00
Aanand Prasad
58a7844129 Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore 
Make it possible to run tests remotely
(cherry picked from commit c8e096e0895cb3589c4699daa44c299ea23f790c)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Daniel Nephin
4353f7b9f9 Merge pull request #1475 from fordhurley/patch-1 
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26f7b1ce097a6b475799364720bcb6cb)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
8f8693e13e Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop 
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744b4005441b289f6b3fb4eef551b5214)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Ben Firshman
363a6563c7 Merge pull request #1537 from aanand/reorder-service-utils 
Reorder service.py utility methods
(cherry picked from commit e3525d64b55ba6b95adab54ac0b5baf22d7740e0)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
59d6af73fa Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
(cherry picked from commit 4c2112dbfd4da219f2585569b716b59f7562b034)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
cd7f67018e Merge pull request #1466 from noironetworks/changing-scale-to-warning 
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c59774a8cbf503a57cb9f3b0d47d1fe)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00