tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,993 Commits 20 Branches 280 Tags
Commit Graph

2993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
a822406eb0 Update docker-py version in requirements 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-28 15:49:06 -07:00
Aanand Prasad
72d3d5d84b Merge pull request #3612 from dnephin/tests_for_bundle 
Add some unit tests and an acceptance test for bundle
 2016-06-28 14:47:29 -07:00
Aanand Prasad
55e20d1727 Merge pull request #3652 from aanand/fix-tests-for-1.12 
Fix tests to accommodate short-id container alias
 2016-06-28 13:27:40 -07:00
Daniel Nephin
7c06f60573 Merge pull request #3563 from adamchainz/readthedocs.io 
Convert readthedocs links for their .org -> .io migration for hosted projects
 2016-06-28 12:35:19 -04:00
Daniel Nephin
00decf8677 Merge pull request #3638 from aanand/update-bundle-extension 
Update bundle extension
 2016-06-28 11:43:58 -04:00
Daniel Nephin
5640bd42a8 Add an acceptance test for bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-28 10:18:59 -04:00
Daniel Nephin
95207561bb Add some unit tests for new bundle and push commands. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-28 10:18:20 -04:00
Aanand Prasad
8e04582052 Fix tests to accommodate short-id container alias 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-27 16:21:19 -07:00
Aanand Prasad
058a7659ba Update bundle extension 
It's now .dab, for Distributed Application Bundle

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-27 14:16:44 -07:00
Aanand Prasad
fe0654603c Merge pull request #3619 from jgiannuzzi/fix_tests 
Fix assertion that was always true
 2016-06-27 14:16:00 -07:00
Andre Eriksson
c3247e7af8 zsh autocomplete: update misleading comment 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:07:59 -07:00
Andre Eriksson
b3d4e9c9d7 zsh autocomplete: break out duplicated flag messages into variables 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
0058b4ba0c zsh autocomplete: replace use of sed with cut 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
612d263d74 zsh autocomplete: fix issue when filtering on already selected services 
Previously, the filtering on already selected services would break when
one service was a substring of another.

This commit fixes that.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
048408af48 zsh autocomplete: fix missing services issue for build/pull commands 
Previously, the autocomplete for the build/pull commands would only add
services for which build/image were the _first_ keys, respectively, in
the docker-compose file.

This commit fixes this, so the appropriate services are listed
regardless of the order in which they appear

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
d990f7899c zsh autocomplete: pass all relevant flags to docker-compose/docker 
For autocomplete to work properly, we need to pass along some flags when
calling docker (--host, --tls, …) and docker-compose (--file, --tls, …).

Previously flags would only be passed to docker-compose, and the only
flags passed were --file and --project-name.

This commit makes sure that all relevant flags are passed to both
docker-compose and docker.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
97ba14c82a zsh autocomplete: use two underscores for all function names 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
1b5a94f4e4 zsh autocomplete: bring flag help texts up to date 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
8d2fbe3a55 zsh autocomplete: add 'build' flag for 'create' and 'up' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
eb10f41d13 zsh autocomplete: fix incorrect flag exclusions for 'create' and 'up' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
73a1b60ced zsh autocomplete: add missing 'remove-orphans' flag for 'up' and 'down' 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
b3d9652cc3 zsh autocomplete: add missing docker-compose base flags 
Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Andre Eriksson
cbb44b1a14 fix broken zsh autocomplete for version 2 docker-compose files 
This has the added benefit of making autocompletion work when the
docker-compose config file is in a parent directory.

Signed-off-by: Andre Eriksson <aepubemail@gmail.com>
 2016-06-27 11:00:17 -07:00
Ke Xu
a0a90b2352 add zsh completion for push 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-27 18:00:52 +09:00
Ke Xu
aa7f522ab0 add zsh completion support for bundle 
Signed-off-by: Ke Xu <leonhartx.k@gmail.com>
 2016-06-27 17:48:14 +09:00
Sven Dowideit
5c1abe2e29 Merge pull request #3631 from jamesottaway/patch-1 
Document `tmpfs` being v2 only
 2016-06-27 11:50:15 +10:00
James Ottaway
f77dbc06cc Document tmpfs being v2 only 
Signed-off-by: James Ottaway <git@james.ottaway.io>
 2016-06-24 10:54:51 +10:00
Harald Albers
f49b624d95 bash completion for docker-compose push 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-22 17:19:20 +02:00
Harald Albers
e5c5dc09f8 bash completion for docker-compose bundle 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-06-22 17:06:30 +02:00
Jonathan Giannuzzi
3c77db709f Fix assertion that was always true 
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
 2016-06-20 14:48:45 +02:00
Anton Backer
80af26d2bb togather -> together 
Signed-off-by: Anton Backer <anton.backer@newsela.com>
 2016-06-15 15:55:45 -07:00
Aanand Prasad
352cdf0a80 Merge pull request #3601 from aanand/warn-on-missing-digests 
Warn on missing digests, don't push/pull by default
 2016-06-15 14:28:49 -07:00
Aanand Prasad
020d46ff21 Warn on missing digests, don't push/pull by default 
Add a --fetch-digests flag to automatically push/pull

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-14 16:37:32 -07:00
Joffrey F
317cd98c0d Merge pull request #3599 from shin-/tls-version-unavailable-test 
Skip TLS version test if TLSv1_2 is not available on platform
 2016-06-14 12:34:43 -07:00
Victoria
f8f582f349 Merge pull request #3600 from londoncalling/fix-broken-links-PR-23492 
fixes broken links in 3 Compose docs files due to topic re-org in PR#…

Merging to address broken links. One more to go in (DTR).
 2016-06-14 12:30:41 -07:00
Victoria Bialas
a56e44f96e fixes broken links in 3 Compose docs files due to topic re-org in PR#23492 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-06-14 12:24:30 -07:00
Joffrey F
ee68a51e28 Skip TLS version test if TLSv1_2 is not available on platform 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-14 12:23:04 -07:00
Joffrey F
0fe82614a6 Merge pull request #3595 from dnephin/add-push-and-bundle 
Add docker-compose push and docker-compose bundle
 2016-06-14 10:57:32 -07:00
Aanand Prasad
8f8c17bf66 Merge pull request #3549 from shin-/KalleDK-master 
Add support for COMPOSE_TLS_VERSION config option
 2016-06-14 10:57:12 -07:00
Daniel Nephin
9b7bd69cfc Support entrypoint, labels, and user in the bundle. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-06-14 13:00:12 -04:00
Aanand Prasad
1ea9dda1d3 Implement 'docker-compose push' and 'docker-compose bundle' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-06-14 12:06:14 -04:00
Aanand Prasad
21f20cbc9b Merge pull request #3449 from Andrey9kin/ready/3281 
Fix #3281: Unexpected result when using build args with default values
 2016-06-14 08:05:07 -07:00
alex
68d73183eb Fix a typo in a test's name. 2016-06-13 23:36:34 -04:00
Aanand Prasad
2123906586 Merge pull request #3577 from sanmai-NL/3576-byte_str_fix 
Fix byte/str typing error
 2016-06-14 01:58:27 +01:00
Aanand Prasad
59e96fea4f Merge pull request #3588 from shin-/3285-root-mount 
Fix split_path_mapping behavior when mounting "/"
 2016-06-14 01:45:20 +01:00
Joffrey F
60f7e021ad Fix split_path_mapping behavior when mounting "/" 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-13 15:32:10 -07:00
Sander Maijers
61324ef308
Fix byte/str typing error 
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
 2016-06-10 16:30:46 +02:00
David Beitey
0287486b14 Fix minor YAML typo 
Signed-off-by: David Beitey <david@davidjb.com>
 2016-06-09 17:00:31 +10:00
Adam Chainz
9ddb7f3c90 Convert readthedocs links for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.

Signed-off-by: Adam Chainz <adam@adamj.eu>
 2016-06-08 03:52:12 +01:00
Aanand Prasad
e502417df2 Merge pull request #3475 from shin-/3429-networks-config-serialize 
Output valid config in config command
 2016-06-07 18:01:39 +02:00