2fb946b8f0
fix anchors ( #1381 )
...
signed-off by Michael Friis <friism@gmail.com>
2017-01-26 02:58:54 -08:00
bfbfbeeec5
added missing descriptions for update_config options
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 14:31:07 -08:00
ef95a915eb
Fixing broken links
...
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
2f472446a1
Add udp ports example ( #1098 )
2017-01-24 15:49:44 -08:00
bb81ccb937
Update envvars.md ( #1008 )
...
* Update envvars.md
Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS
* Update envvars.md
2017-01-24 15:37:06 -08:00
cf42e71f2e
update compose install to 1.10.0 ( #1314 )
2017-01-24 14:48:37 -08:00
8b1117ad58
Update django.md
...
Fixed typo
2017-01-23 09:21:17 -05:00
ebe778b906
Update imports to work properly ( #1221 )
...
Update imports to work properly
2017-01-20 09:58:54 -08:00
3b314c12db
draft 3 voting app sample updates
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:14:44 -08:00
7063c5e921
Add notice for unsupported Compose file option when deploying stack.
2017-01-19 21:33:45 -08:00
1e6b46b700
Add notice for ignored Compose file options when deploying a stack.
2017-01-19 21:33:45 -08:00
19777ec0b9
Add new depends_on syntax documentation ( #1031 )
...
Miscellaneous fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 21:25:03 -08:00
5eb55e8414
Add sysctls option documentation
...
Describe the sysctls compose-file option.
2017-01-19 21:25:03 -08:00
6c9616177e
Update Compose file reference for version 3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2017-01-19 21:24:59 -08:00
8c458d4d82
Add documentation for service `userns_mode` key
2017-01-19 21:24:05 -08:00
3af3a8b7a2
Merge pull request #1146 from shin-/ipv6_networks_compose
...
Update instructions for IPv6-enabled networks
2017-01-18 15:28:22 -08:00
749701f7d9
minor copyedits ( #1148 )
...
* minor copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-18 15:27:27 -08:00
ec839d5bf8
Merge pull request #1007 from NickvdMeij/patch-2
...
Update overview.md
2017-01-17 23:23:32 -08:00
efb8c5e492
Update instructions for IPv6-enabled networks
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 15:43:52 -08:00
a3a53fc3ff
more more link link fixes fixes
...
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
fde978afc5
more link fixes
...
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 14:43:52 -08:00
e5e2b2d34a
Update overview.md
...
Update overview.md to reference possible issues regarding windows to unix path convert issues
2016-12-30 21:46:29 +01:00
0d7778af0c
Merge pull request #991 from sergei-solomonov/patch-1
...
typo fixed
2016-12-29 14:28:10 -08:00
b6a8bfc1ac
Excess '>' symbol deleted
2016-12-29 00:31:29 +07:00
b0ccda058e
typo fixed
2016-12-28 23:06:39 +07:00
5919563eb8
Lossless Image optimization ( #959 )
...
* re-compress jpg images losslessly using jpegoptim
* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
36ac04c1fa
Add a note to `env_file` option ( #932 )
...
* Add a note to `env_file` option
2016-12-19 15:02:42 -08:00
dc22bdd7e8
Merge pull request #879 from buuren/patch-2
...
Update environment-variables.md
2016-12-19 14:22:17 -08:00
3275110fb1
Update environment-variables.md
...
Anchor #env-file does not exist. Correct anchor is #envfile
2016-12-14 12:18:37 +02:00
d3bec385f1
Update index.md
2016-12-13 12:06:37 -05:00
1939c2cd19
Merge pull request #684 from aanand/update-compose-getting-started
...
Updates to Compose getting started guide
2016-12-08 17:15:51 -08:00
855e532435
Update db:create to use latest recommended format ( #787 )
...
Latest best practice is use `rails` vice `rake`.
http://guides.rubyonrails.org/command_line.html#db
2016-12-08 12:21:46 -08:00
7ce29c9a76
Merge pull request #817 from londoncalling/banner-for-old-swarm-docs
...
added advisory banner to legacy swarm docs w/links to swarm mode
2016-12-06 23:08:17 -08:00
59c5544d8b
added advisory banner to legacy swarm docs w/links to swarm mode
...
copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-06 17:03:45 -08:00
d9efcc4df1
Add note about .env file to variable substitution docs ( #801 )
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:41:21 -08:00
9407f9ef05
Update docs around entrypoint option ( #712 )
...
- Clarify that setting `entrypoint` overrides both the entrypoint and
the command on the image
- Fix the incorrect examples in the doc on startup order, which assumed
that the default command would not be overridden
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:40:12 -08:00
88154eacbe
fix error on swarm constraint exemple ( #749 )
...
Constraints for Swarm scheduling are defined as an **environment** option, according to the example in the section *Manual scheduling*, and not as a **label** option
2016-11-30 11:40:05 -08:00
d9a5c2666a
update to 1.9.0 version ( #699 )
2016-11-29 13:55:06 -08:00
53da48206b
Update to Rails 5, Ruby 2.3.3, remove therubyracer ( #718 )
...
* Update to Rails 5, Ruby 2.3.3, remove therubyracer
Update packages to latest versions. The actual nodejs is installed on line 18. Changed to a general comment regarding the need to rebuild images when adding gems.
* update rails welcome screenshot to 5.0.0.1
2016-11-29 13:52:16 -08:00
a086af7a8b
rails.md: change the database.yml in the example ( #701 )
...
In this example, database.yml uses the default value of `postgres` for the `database` key.
The database postgres is normally not used for user data, but for administrative purposes. This means people following this example will not be able to drop the database, and in general it's just not a great idea.
2016-11-29 13:50:01 -08:00
39f87cbc6a
Fix access denied
2016-11-29 12:17:52 +03:00
2d813e26fd
Fix link to link_local_ips
2016-11-28 13:40:17 -08:00
756f4d974c
Fix some doubled words
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08:00
07fdd239c7
Update extends.md
...
Just corrected a missing 'and'
2016-11-22 20:12:14 +00:00
b08c014fd8
Updates to Compose getting started guide
...
- Some wording and formatting tweaks
- Use Python 3.4, because it's 2016
- Use Alpine-based images for faster downloads and less disk space usage
- Use the list form of `CMD` in the Dockerfile, so it's not wrapped in
sh
- Remove the `depends_on` from `docker-compose.yml`, as it's not really
needed - the web app connects to Redis when it's visited, not on
startup
- Add a section on updating the app and seeing the changes, because
that's the point of mounting the code in!
- Add a note about `docker-compose down`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-22 16:33:43 +00:00
a259f45166
clarified use of .yml and .yaml for Compose file, both can be used
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-18 12:21:51 -08:00
0b71b84ad4
Merge pull request #550 from davidwilliamson/patch-1
...
Update compose example to work better with swarm
2016-11-17 17:30:14 -08:00
7caec61ef4
Merge pull request #573 from alternatekev/patch-1
...
Update wordpress.md
2016-11-17 15:27:46 -08:00
7da6a0bd21
add 'none' cue to large screentext block
...
...to prevent weird syntax highlighting.
2016-11-17 09:31:06 -08:00
b2eb693d00
Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge
2016-11-16 12:03:45 -08:00
9a39f03cb7
Merge pull request #595 from ankon/patch-1
...
Use curl's -o to specify the output
2016-11-16 11:42:48 -08:00
698f8d26f4
Merge pull request #593 from jefferybradberry/patch-1
...
There are two differences
2016-11-16 11:34:18 -08:00
1249d35fca
added troubleshooting info about shared drives/files and volume mounting
...
added more changes
updated per Nathan's comments on properly documenting directories formats for all platforms
incorporated Daniel's review comments, and added a clarification re: users' dir
copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-16 11:02:04 -08:00
f07aa9e026
Use curl's -o to specify the output
...
This makes it easier to fix up the command by just prepending a `sudo` if something goes wrong.
2016-11-16 13:05:30 +01:00
b68ad3aced
There are two differences
...
Add missing word.
2016-11-16 04:43:22 -05:00
c4d4069279
Update wordpress.md
...
capital_P_dangit()
2016-11-15 09:47:54 -07:00
186dfbb336
Update compose example to work better with swarm
...
Update the compose example:
* Remove the `links` directive. This allows swarm to distribute containers across available nodes. (with the `links` directive, swarm will be forced to run both containers on the same node.) Note that the `depends_on` directive is sufficient to ensure correct container start up sequence.
* Use a docker volume instead of bind mounting a local directory.
* Give docker-compose commands for shutting down the Wordpress app, showing how to preserve or remove the persisted data in the volume.
Verified proposed change works correctly in both a swarm and a non-swarm environment.
2016-11-11 14:24:39 -08:00
4d83c1bb08
Add missing dollar-sign / consistent shell style ( #426 )
...
* Add missing dollar-sign
* Remove dollar-sign for single commands without output
2016-11-10 14:54:49 -08:00
2ea564166d
fix type of keywords entry in frontmatter (in /compose/ dir) ( #481 )
...
keywords should be a string, not an array containing one string
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -08:00
949a89e6ea
Merge pull request #152 from mstanleyjones/redirect_from
...
Change 'alias:' to 'redirect_from:' so aliases work again
2016-11-04 17:34:27 -07:00
f4b0ec85ff
Merge pull request #339 from dave-pollock/patch-1
...
Update swarm.md
2016-11-04 17:11:40 -07:00
eb5c8670bc
Change instances of alias: to redirect_from:
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
558314bf56
Converges titles to imperative-form, front-matter based, and sentence-case ( #438 )
...
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
ac0cef5d0f
Merging master into vnext-compose
...
includes conflict resolution
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 15:25:34 -07:00
1a193d749b
Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
...
This reverts commit 13ddc1350e7a11f05943
2016-11-04 13:33:29 -07:00
33d3d067d0
Revert "fix some frontmatter keywords values"
2016-11-04 13:30:04 -07:00
0827ba283c
Revert "fix frontmatter keywords values in compose/reference/ files"
2016-11-04 13:28:43 -07:00
13ddc1350e
Merge pull request #437 from gdevillele/fix_keywords_format
...
fix some frontmatter keywords values
2016-11-04 10:50:53 -07:00
8bb4d6226a
fix more frontmatter keywords values ( #439 )
...
* fix format of frontmatter keyword entry in some .md files
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
4c3cf8e7fd
Update docs to mention new additions in Compose 1.9.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 15:05:24 -07:00
7a11f05943
fix some frontmatter keywords values
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -07:00
bb4f3be02e
fix frontmatter keywords values in compose/reference/ files
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:13:21 -07:00
8fa5f3a5de
absolute links to docs.docker.com are now relative links
...
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
980956ef9d
incorporated misty's comments
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-31 12:43:52 -07:00
870abe59b4
added a filename above the custom script
...
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
2016-10-26 21:24:36 -04:00
9c5319211d
Fixing note formatting
...
Changing note format back to the way it was to match the rest of the notes in this section.
2016-10-26 16:58:24 -07:00
568cded2a5
finishing touches on Wordpress example in Compose docs per pr#129
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-26 13:46:53 -07:00
be3e860fa1
Merge pull request #328 from alexandair/patch-1
...
Update index.md
2016-10-25 14:25:52 -07:00
7fd5e20337
Update ps.md
2016-10-25 11:38:33 -07:00
e65a98ef9f
Update install.md
2016-10-25 11:24:45 -07:00
50d7898fe4
Update gettingstarted.md
2016-10-25 11:22:30 -07:00
100a82043a
Update gettingstarted.md
2016-10-25 11:18:39 -07:00
1967bd2603
Update swarm.md
...
Scheduling filters should be configured in the environment section of compose files - NOT labels.
2016-10-25 14:57:00 +01:00
1de1d10073
At paragraph "links", fixed anchor-link to "depends-on"
2016-10-24 12:01:00 +02:00
18499881e5
Update index.md
...
Fix typo.
2016-10-23 20:12:47 +02:00
bce5d70ce6
Updates compose install to 1.8.1
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-10-19 15:57:43 -07:00
673523ee9a
Update django.md
...
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .
See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
2016-10-19 17:07:49 +02:00
5d9e15dcad
Merge pull request #174 from IRus/patch-1
...
This guide used legacy backticks.
2016-10-18 16:35:17 -07:00
83ec5da00d
Merge pull request #196 from ezeeetm/patch-1
...
update 'environment' to 'labels'
2016-10-18 16:13:16 -07:00
3c41a34fd6
Typo in cd command
...
Fixes typo in command.
(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
2016-10-18 20:44:36 +02:00
3129564e3d
Merge pull request #251 from liubin/master
...
remove redundant back slash
2016-10-18 11:37:04 -07:00
01910ab6d9
Update branding for macOS
...
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
c8b449e7e0
remove redundant back slash
...
I think this is a redundant back slash, should be removed.
2016-10-18 22:31:25 +08:00
91b9a38864
update 'environment' to 'labels'
...
according to @aanandPrasad
constraining containers in swarm with compose is now done with 'labels' as of Swarm 0.3 and Compose 1.3
https://groups.google.com/forum/#!topic/docker-dev/Uzcies21qPo
2016-10-13 14:40:17 -07:00
bb7661a926
Document Compose's syntax for variable defaults
...
This feature was not supported previously, but
was added in https://github.com/docker/compose/pull/3108
2016-10-12 09:50:40 -07:00
0778af3d17
This guide used legacy backticks.
...
https://github.com/koalaman/shellcheck/wiki/SC2006
https://github.com/koalaman/shellcheck/wiki/SC2046
2016-10-12 14:19:24 +03:00
c98a6d8902
example pls
2016-10-08 23:35:37 +04:00
8ea375e1d7
Fix for list in compose-file, CSS fixes for blockquotes
2016-10-07 13:48:23 -07:00
1b8729c5be
remove prefix space
...
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/
but github clear it on preview .md
2016-10-07 23:18:45 +04:00
9a2be62bf8
Update compose-file.md
...
Document that the journald logging driver allows docker-compose logs to work.
2016-10-05 11:40:42 -05:00
0133cb646d
Merge pull request #21 from pborreli/typos
...
Fixed typos
2016-09-30 11:51:42 -07:00
066b78bf86
Content rendering fixes
2016-09-30 01:51:56 -07:00
0ad083ff1f
Delete Makefile
2016-09-29 23:40:58 -07:00
d8b7717467
Delete Dockerfile
2016-09-29 23:40:48 -07:00
99bab305bd
Removing merge detritus
2016-09-29 23:38:12 -07:00
6cd3fe8bd2
Fixed typos
2016-09-30 01:52:12 +01:00
d53c6798c9
Convert TOML to YAML, tweaks to work with Jekyll
2016-09-29 17:16:03 -07:00
9f31bb790d
Put back inadvertently deleted compose directory
2016-09-29 12:13:47 -07:00
701f170a21
Move docker-hub docs to docker-hub subdirectory
2016-09-29 10:38:52 -07:00
7629f462d5
Moved compose docs to compose subdirectory
2016-09-28 14:52:24 -07:00
f3628c7a5e
Bump 1.8.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 11:57:23 -07:00
e115eaf6fc
Fix error message for unrecognised TLS version
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 11:57:23 -07:00
cefa239c2e
Bump 1.8.0-rc3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 17:46:13 +01:00
35ed189981
Copy experimental bundle docs into Compose docs so URL is stable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
c392acc56b
Show a warning when engine is in swarm mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
cd267d5121
Add user agent to API calls
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
cb076a57b9
Suggest to run Docker for Mac if it isn't running
...
Instead of suggesting docker-machine.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
0488dd3709
Rename --fetch-digests to --push-images and remove auto-pull
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
b72f911ccf
Fix timeout value in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
f9c5816ab8
Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
2ecbf25445
Fix bugs with entrypoint/command in docker-compose run
...
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
e1b7510e4a
service: detailed error messages for create and start
...
Fixes : #3355
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-27 16:27:05 +01:00
c72c966abc
Bump 1.8.0-rc2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 18:05:11 -07:00
217f762a60
Post-merge fix - restore Environment import in main.py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 16:20:18 -07:00
70da16103a
Unset env vars behavior in 'run' mirroring engine
...
Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-06 16:20:17 -07:00
72849d99c0
Update bundle extension
...
It's now .dab, for Distributed Application Bundle
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 16:20:17 -07:00
a7fc3e2220
Add an acceptance test for bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-06 16:20:16 -07:00
db02c9f537
Add some unit tests for new bundle and push commands.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-06 16:20:16 -07:00
33cc601176
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-07-06 16:20:16 -07:00
9bf6bc6dbd
Bump 1.8.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-14 12:35:46 -07:00
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
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
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
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
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
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
60f7e021ad
Fix split_path_mapping behavior when mounting "/"
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 15:32:10 -07:00
61324ef308
Fix byte/str typing error
...
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
2016-06-10 16:30:46 +02:00
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
ea640f3821
Remove external_name from serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 12:10:09 -07:00
e7a8b2fed5
Update TLS version configuration code. Tests.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 11:45:22 -07:00
a67ba5536d
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-28 11:39:41 +02:00
c148849f0e
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 20:16:52 +02:00
e3e8a619cc
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string.
Usecase:
cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change build args will not passed to docker engine if they are equal to string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 07:48:13 +02:00
c4229b469a
Improve merging for several service config attributes
...
All uniqueItems lists in the config now receive the same treatment removing
duplicates.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:29:04 -07:00
842e372258
Eliminate duplicates when merging port mappings from config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:28:35 -07:00
7763122ecb
Merge pull request #3459 from shin-/2487-split-volume-path
...
Always use the Windows version of splitdrive when parsing volume mappings
2016-05-20 11:42:43 +01:00
9a39208741
Merge pull request #3482 from aanand/fix-prompt-buffering
...
Fix bug where confirmation prompt doesn't show due to line buffering
2016-05-19 08:52:34 -07:00
0c8aeb9e05
Fix bug where confirmation prompt doesn't show due to line buffering
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-19 15:44:17 +01:00
db0a6cf2bb
Always use the Windows version of splitdrive when parsing volume mappings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-17 16:33:59 -07:00
844b7d463f
Update rm command to always remove one-off containers.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-16 14:59:33 -07:00
e5645595e3
Fail gracefully when -d is not provided for exec command on Win32
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-12 14:00:54 -07:00
72f6a5c8d3
Merge pull request #3433 from anton44eg/issue_3432
...
add msg attribute to ProjectError class
2016-05-12 16:55:11 +01:00
dc88e54010
Merge pull request #3399 from yorkedork/fix/env-file-validation
...
Adds additional validation to 'env_vars_from_file'.
2016-05-12 08:53:25 -07:00
4b01f6dcd6
add msg attribute to ProjectError class
...
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
2016-05-09 18:26:20 +07:00
310b3d9441
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-02 13:42:05 -07:00
28fb91b344
Adds additional validation to 'env_vars_from_file'.
...
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.
This change adds an additional validation to allow the use of this
path provided it is not a file.
Signed-off-by: Thom Linton <thom.linton@gmail.com>
2016-04-29 17:53:31 -07:00
fe17e0f948
Skip event objects that don't contain a status field
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:39:42 -07:00
bd7ec24e25
Merge pull request #3384 from shin-/3264-shorthand-host-support
...
Support combination of shorthand flag and equal sign for host option
2016-04-29 16:39:16 -07:00
8cc7d68a00
Merge pull request #3390 from aronahl/master
...
Add missing log event filter when using docker-compose logs.
2016-04-28 12:53:04 -07:00
0b24883cef
Support combination of shorthand flag and equal sign for host option
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 12:52:00 -07:00
2efcec776c
Add missing log event filter when using docker-compose logs.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2016-04-28 15:14:44 +00:00
61794ba97c
Merge pull request #3377 from shin-/3372-windowserror
...
Define WindowsError on non-win32 platforms
2016-04-28 10:33:18 -04:00
d3e645488a
Define WindowsError on non-win32 platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 11:40:31 -07:00
756ef14edc
Fix format of 'restart' option in 'config' output
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
6064d200f9
Fix output of 'config' for v1 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
b67f110620
Explain the explanation about file versions
...
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:40:16 -07:00
27628f8655
Make validation error less robotic
...
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"
is now:
"ERROR: The Compose file './docker-compose.yml' is invalid because:"
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:38:09 -07:00
cafe1315b2
Merge pull request #3334 from werehuman/fix-config-hash-change
...
Fix #3248 : Accidental config_hash change
2016-04-19 12:42:19 +01:00
984f839d33
Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature
...
Added code to support no argument help command
2016-04-19 12:14:24 +01:00
d21e1c5a30
Merge pull request #3335 from johnharris85/master
...
Fix CLI docstring to reflect Docopt behaviour.
2016-04-19 12:13:20 +01:00
52fa010ac7
Merge pull request #3337 from dnephin/check_for_short_id_alias
...
Check for short id alias, and don't disconnect if it already exists
2016-04-19 12:12:43 +01:00
6d2805917c
Account for aliased links
...
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 15:25:06 -04:00
68272b0216
Config now catches undefined service links
...
Fixes issue #2922
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 14:00:07 -04:00
56c6e29819
Unit test for skipping network disconnect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-15 16:28:59 -04:00
4702703615
Fix #3248 : Accidental config_hash change
...
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
2016-04-15 15:34:30 +03:00
ad306f0479
Fix CLI docstring to reflect Docopt behaviour.
...
Signed-off-by: John Harris <john@johnharris.io>
2016-04-15 13:30:13 +01:00
e1356e1f6f
Set networking_config when creating a container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 18:09:06 -04:00
abb5ae7fe4
Only disconnect if we don't already have the short id alias.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 16:05:14 -04:00
e2cb7b0237
Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers
...
Only show port clash warning if multiple containers are about to be started
2016-04-14 10:40:02 +01:00
50287722f2
Update release notes and set version to 1.8.0dev
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-13 13:27:18 -04:00
339ebc0483
Fixes #2096 : Only show multiple port clash warning if multiple containers
...
are about to be started.
Signed-off-by: Danyal Prout <me@dany.al>
2016-04-12 20:58:21 +01:00
3d3f331404
Merge pull request #3303 from aanand/clarify-rm-and-down
...
Clarify behaviour of rm and down
2016-04-12 11:31:22 +01:00
7cfb5e7bc9
Fix race condition
...
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 17:05:52 +01:00
3722bb38c6
Clarify behaviour of rm and down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 16:31:27 +01:00
15c5bc2e6c
Rename a couple of functions in parallel.py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:05:30 +01:00
0671b8b8c3
Document parallel helper functions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:51:27 +01:00
0e3db185cf
Small refactor to feed_queue()
...
Put the event tuple into the results queue rather than yielding it from
the function.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:37:00 +01:00
83df95d511
Remove extra ensure_image_exists() which causes duplicate builds.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-08 15:21:12 -04:00
be27e266da
Reduce queue timeout
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:07:40 +01:00
5450a67c2d
Hold state in an object
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:06:07 +01:00
54b6fc4219
Refactor so there's only one queue
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:54:02 +01:00
af9526fb82
Move queue logic out of parallel_execute()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:30:28 +01:00
141b96bb31
Abort operations if their dependencies fail
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 17:51:09 +01:00
bcdf541c8c
Refactor setup_queue()
...
- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
producers
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 16:24:29 +01:00
9f47e43b5c
Merge branch 'master' into 3191_2_help_cli_feature
2016-04-07 12:43:34 -04:00
b33d7b3dd8
Prevent unnecessary inspection of containers when created from an inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-06 11:14:42 -04:00
129fb5b356
Added code to output the top level command options if docker-compose help with no command options provided
...
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-04 13:15:28 -04:00
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
1506f997de
Better windows support for Environment class
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
b99037b4a6
Add support for DOCKER_* variables in .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
c7afe16419
Account for case-insensitive env on windows platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
0ff53d9668
Less verbose environment invocation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
f48da96e8b
Test get_project_name from env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
1801f83bb8
Environment class cleanup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
b9ca5188a2
Remove Environment singleton, instead carry instance during config processing
...
Project name and compose file detection also updated
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c69d8a3bd2
Implement environment singleton to be accessed throughout the code
...
Load and parse environment file from working dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c3eca82749
Merge pull request #3128 from dnephin/add_network_settings_to_config_hash
...
Include network settings as part of the service config hash.
2016-03-23 17:01:32 +00:00
2cc87555cb
tls_config_from_options unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:57:45 -07:00
442dff72b4
Improve assert_hostname setting in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
26f3861791
Specifying --tls no longer overrides all other TLS options
...
Add an option to skip hostname verification
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
7166408d2a
Fixed typos + simplified TLSConfig creation process.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
1ac33ea7e5
Add support for TLS config command-line options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
4f5123bda9
Merge pull request #3168 from dnephin/fix_tty_timeout
...
Handle all timeout errors consistently
2016-03-22 10:14:52 +00:00
aaa7b09369
Merge pull request #3181 from dnephin/fix_partial_change_test_failure
...
Fix flaky partial_change state test
2016-03-22 10:14:28 +00:00
a20b84e6d2
Merge pull request #3178 from aanand/2774-off-one-offs
...
Remove one-off containers in `rm` and `down`
2016-03-22 10:12:21 +00:00
5c968f9e15
Fix flaky partial_change state test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 19:07:50 -04:00
be1476f24b
Only allow tmpfs on v2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 14:41:28 -04:00
2bf5e46857
Stop and remove still-running one-off containers in 'down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 18:08:07 +00:00
a2317dfac2
Remove one-off containers in 'docker-compose down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 16:15:49 +00:00
81f6d86ad9
Warn when --all is not passed to rm
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 15:14:31 +00:00
1bc9469674
Don't allow boolean values for one_off in Project methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 14:42:57 +00:00
5826a2147b
Use enum to represent 3 possible states of the one_off filter
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +00:00
187ea4cd81
Add --all option to rm command - remove one-off containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +00:00
7fc40dd7cc
Adding ssl_version to docker_clients kwargs
...
Select tls version based of COMPOSE_TLS_VERSION
Changed from SSL to TLS
Also did docs - missing default value
Using getattr and raises AttributeError in case of unsupported version
Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
2016-03-19 01:15:03 +01:00
089ec66522
Include network settings as part of the service config hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:20:03 -04:00
85c7d3e5ce
Add support for docker run --tmpfs flag.
...
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
2016-03-18 18:19:48 -04:00
f1dce50b3d
Handle all timeout errors consistently.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:19:35 -04:00
72ed4d3f97
Merge pull request #3152 from aanand/update-mac-install-url
...
Update Mac Engine install URL in error message
2016-03-17 17:56:34 +00:00
20bf05a6e3
Fix TypeError in Exception handling
...
Traceback (most recent call last):
File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
sys.exit(main())
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
log_api_error(e)
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
2016-03-17 15:13:01 +00:00
92d69b0cb6
Update Mac Engine install URL in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 09:56:44 +00:00
371ea479f5
Merge pull request #3075 from dnephin/reactive_logs
...
Display logs for new containers started after the command is run
2016-03-16 21:03:25 +00:00
abddabfb0a
Merge pull request #3135 from dnephin/fix_down_idempotency
...
Make down idempotent, continue to remove resources if one is missing
2016-03-16 20:26:18 +00:00
dd40331b44
Merge pull request #3102 from shin-/1477-a-modest-proposal
...
Add flag to up/down to remove orphaned containers
2016-03-16 10:58:15 -07:00
20c29f7e47
Add flag to up/down to remove orphaned containers
...
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-15 16:11:49 -07:00
52b791a264
Split off build_container_options() to reduce the complexity of run
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 15:29:24 -04:00
658803edf8
Add -w or --workdir to compose run to override workdir from commandline
...
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
2016-03-15 15:28:32 -04:00
bf96edfe11
Reduce the args of some functions by including presenters as part of the thread_args.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 15:15:00 -04:00
e5529a89e1
Make down idempotent, continue to remove resources if one is missing.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:26:29 -04:00
e8a93821d4
Fix race condition where a container stopping and starting again would cause logs to miss logs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:11 -04:00
3f7e5bf768
Filter logs by service names.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
48ed68eeaa
Fix geneartors for python3.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
4cad2a0c5f
Handle events for removed containers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
44c1747127
Add tests for reactive log printing.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
65797558f8
Refactor log printing to support containers that are started later.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
34de1f0a4c
Removed unused parallel.parallel_stop
...
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
2016-03-14 22:56:58 +03:00
f933381a12
Dependency-ordered start/stop/up
...
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
2016-03-14 22:55:42 +03:00
e5cd869c61
Merge pull request #3095 from dnephin/refactor_command_dispatch
...
Refactor command dispatch and fix api version mismatch error
2016-03-14 16:18:29 +00:00
ee136446a2
Fix #2804 : Add ipv4 and ipv6 static addressing
...
- Added ipv4_network and ipv6_network to the networks section in the
service section for each configured network
- Added feature documentation
- Added unit tests
Signed-off-by: Matt Daue <mattdaue@gmail.com>
2016-03-09 18:37:52 -05:00
7033042656
Merge pull request #3039 from dbonev/3020-build-arguments-object-syntax
...
Allowing null for build args
2016-03-09 10:55:05 -08:00
0a091055d2
Improve handling of connection errors and error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-08 15:39:11 -05:00
9f9dcc098a
Make TopLevelCommand use the project field.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-08 14:36:53 -05:00
53bea8a720
Refactor command dispatch to improve unit testing and support better error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-08 14:23:27 -05:00
d2b065e615
Don't raise ConfigurationError for volume driver mismatch
...
when driver is unspecified
Add testcase
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-07 18:07:41 -08:00
698998c410
Don't call create on existing volumes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-07 18:00:27 -08:00
81b7fba33e
Allowing null for build args
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-03-05 15:57:06 +02:00
9e242cdc75
Merge pull request #3032 from dnephin/multiple_files_from_env_var
...
Support multiple files in COMPOSE_FILE env var
2016-03-03 17:23:22 +00:00
4ae71f41dd
Merge pull request #2832 from aanand/refactor-cli-unit-tests
...
Refactor CLI initialization and unit tests
2016-03-02 16:10:44 -08:00
53a3d14046
Support multiple files in COMPOSE_FILE env var.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 18:47:58 -05:00
575b48749d
Remove unused global_options arg from dispatch()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 15:09:48 -08:00
f75408923e
Merge pull request #3053 from dnephin/handle_booleans_in_mappings
...
Don't allow booleans for mapping types
2016-03-02 15:04:20 -08:00
3f98c0716e
Merge pull request #3052 from dnephin/merge_v1_logging
...
Fix merging of logging options in v1 config
2016-03-02 15:03:36 -08:00
e1b87d7be0
Update reference docs for the new flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 15:32:51 -05:00
b7fb3a6d9b
Add --build flag for up and create
...
Also adds a warning when up builds an image without the --build flag
so that users know it wont happen on the next up.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 15:32:51 -05:00
0b3561a7d5
Merge pull request #2720 from seguins/2227-improvements-logs
...
Add flags on logs
2016-03-01 17:41:31 -08:00
ed4473c849
Fix signal handling with pyinstaller.
...
Raise a ShutdownException instead of a KeyboardInterupt when a thread.error
is caught. This thread.error is only raised when run from a pyinstaller
binary (for reasons unknown).
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 16:39:43 -05:00
038da4eea3
Logs args of LogPrinter as a dictionary
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:24:15 +01:00
9b36dc5c54
Add --tail flag as option on logs.
...
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
d9b4286f91
Add -t, --timestamps flag as option on logs.
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
82632098a3
Add -f, --follow flag as option on logs.
...
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:43 +01:00
18510b4024
Don't allow booleans for mapping types.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 11:57:35 -05:00
b726f508a6
Fix merging of logging options in v1 config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-01 11:43:26 -05:00
210856179d
Merge pull request #3036 from JesusTinoco/master
...
Display in the log output the name of those containers created using …
2016-02-29 15:17:14 -08:00
6bfb23baaa
Display containers name when scale a container
...
Display in the log output the name of those containers created using the scale command and
change the test_scale_with_api_error test to support the containers name when scale
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2016-02-29 20:19:03 +01:00
d28c5dda92
implement exec
...
Resolves #593
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-02-29 10:50:09 +01:00
adb8de367e
Merge pull request #2388 from dnephin/fix_long_lines
...
Wrap long lines
2016-02-25 16:52:33 -08:00
42f4d814d7
Merge pull request #2880 from dnephin/merge_jsonschemas
...
Merge jsonschemas to a single schema file per version
2016-02-25 16:51:56 -08:00
dc3a5ce624
Refactor config validation to support constraints in the same jsonschema
...
Reworked the two schema validation functions to read from the same schema but
use different parts of it. Error handling is now split as well by the
schema that is being used to validate.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:20:17 -08:00
43ecf8793a
Address old TODO, and small refactor of container name logic in service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
cdda616d6b
Reduce complexity of sort_service_dicts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
84a1822e40
Reduce complexity of _get_container_create_options
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 16:19:38 -08:00
be554c3a74
Merge v1 config jsonschemas into a single file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 15:59:10 -08:00
adb64ef8d5
Merge v2 config jsonschemas into a single file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-24 15:59:10 -08:00
d451578152
Make environment variables without a value the same as docker-cli.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-23 11:14:59 -08:00
4b04280db8
Revert "Change special case from '_', None to ()"
...
This reverts commit 677c50650c00190377127ab9509ce66540efb3d3
2016-02-23 11:13:57 -08:00
1d67e6f0f0
Merge pull request #2995 from dnephin/fix_warning_about_bools
...
Fix warning about boolean values
2016-02-23 11:11:54 -08:00
ba799d2e86
Merge pull request #2996 from dnephin/fix_abort_on_container_exit
...
Fix abort on container exit
2016-02-23 10:52:12 -08:00
15b2094bad
Stop other containers if the flag is set.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-22 16:48:46 -08:00
bf2bf21720
Add failing test for --abort-on-container-exit
...
Handle --abort-on-container-exit. Fixes #2940
Signed-off-by: Richard Bann <richardbann@gmail.com>
2016-02-22 16:39:40 -08:00
0a06d827fa
Fix warning about boolean values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-22 14:56:01 -08:00
d5514965d5
Merge pull request #2975 from dnephin/fix_crash_on_none_in_config
...
Fix validation message when there are multiple nested oneOf validations.
2016-02-19 15:53:26 -05:00
02535f0cf1
Fix validation message when there are multiple ested oneOf validations.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 14:22:55 -05:00
0d218c34c7
Make config validation error messages more consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 13:12:57 -05:00
4b2a666231
Validate that each section of the config is a mapping before running interpolation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 12:38:52 -05:00
0cb8ba3775
Use modern set notation in _get_aliases
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:28:12 -08:00
7152f7ea76
Handle mismatched network formats in config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:24:41 -08:00
825a0941f0
Network aliases are now part of the network dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
41e399be98
Fix network list serialization in py3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
633e349ab9
Test network_aliases feature
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:46 -08:00
2b5d3f51cb
Allow user to specify custom network aliases
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:46 -08:00
d3a95c2892
Merge pull request #2938 from shin-/2927-buildargs-types
...
Constraint build argument types. Numbers are cast into strings.
2016-02-18 15:07:09 -08:00
93a02e497d
Apply driver_opts processing to network configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 10:53:40 -08:00
4f7530c480
Only set a container affinity if there are volumes to copy over.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-17 22:35:14 -05:00
1952b52392
Constraint build argument types. Numbers are cast into strings
...
Numerical driver_opts are also valid and typecast into strings.
Additional config tests.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-17 11:53:29 -08:00
4a09da43ea
Fix copying of volumes by using the name of the volume instead of the host path.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-17 13:34:14 -05:00
74dc1b1411
Merge pull request #2893 from shin-/2833-run-dependencies
...
Bring up all dependencies when running a single service.
2016-02-12 16:33:01 -05:00
a8fda480e3
driver_opts can only be of type string
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-12 10:51:11 -08:00
367fabdbfa
Bring up all dependencies when running a single service.
...
Added test for running a depends_on service
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-12 09:46:10 -08:00
e1d67ad68a
Merge pull request #2882 from shin-/2715-old-server-error
...
Detailed error message when daemon version is too old.
2016-02-11 16:03:20 -08:00
b6812b8600
Merge pull request #2877 from dnephin/fix_merging_build
...
Fix build section without context
2016-02-11 18:53:23 -05:00
79f993f52c
Detailed error message when daemon version is too old.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-11 15:20:32 -08:00
e225f12551
Add logging when initializing a volume.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-11 11:40:22 -08:00
532dffd688
Fix build section without context.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-11 14:12:02 -05:00
23ab2c7e44
Merge pull request #2878 from dnephin/merge_build_args
...
Merge build.args when merging services
2016-02-11 17:41:41 +00:00
ab40d389d0
Fix sorting of DOCKER_START_KEYS.
...
Make sure it's sorted!
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
5e6dc3521c
Add support for shm_size. Fixes #2823 .
...
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22). This requires docker-py 1.8.0
(docker/docker-py#923 ).
Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).
Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
37564a73c3
Merge build.args when merging services.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-10 13:54:40 -05:00
7b5bad6050
Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging
...
Fix merge behavior for 'networks' and 'network_mode'.
2016-02-10 17:51:01 +00:00
6f06b3bd30
Merge pull request #2853 from dnephin/fix_short_id_alias
...
Use 12 characters for the short id
2016-02-09 14:56:24 -05:00
fdf4a2e89e
Merge pull request #2734 from jrabbit/empty-env-var-2359
...
Empty env var #2359
2016-02-08 11:17:54 -08:00
421981e7d2
Use 12 characters for the short id to match docker and fix backwards compatibility.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-08 12:18:48 -05:00
5bd88f634f
Handle the 'network_mode' key when merging multiple compose files.
...
Fixes docker/compose#2840 .
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
2016-02-08 15:33:26 +01:00
5a3a10d43b
Correctly merge the 'services/<service>/networks' key in the case of multiple compose files.
...
Fixes docker/compose#2839 .
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
2016-02-08 15:17:21 +01:00
677c50650c
Change special case from '_', None to ()
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2016-02-06 02:54:06 -05:00
57fc85b457
Wrap long lines and restrict lines to 105 characters.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 19:05:39 -05:00
869e815213
Bump 1.7.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 23:46:41 +00:00
be236d8801
Update docker-py and dockerpty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:16:01 +00:00
80d02e84e2
Merge pull request #2808 from aanand/connect-before-start
...
Connect container to networks before starting it
2016-02-03 23:49:56 -05:00
89c5b800e6
Merge pull request #2782 from dbonev/2772-compose-project-name-empty
...
Falling back to default project name on empty COMPOSE_PROJECT_NAME
2016-02-02 20:37:38 -05:00
2651c00f0c
Connect container to networks before starting it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 19:31:49 +00:00
4c4e94bc19
Merge pull request #2785 from dnephin/depends_on_with_extends
...
Fix list options when used with extends and multiple files
2016-02-02 13:36:46 -05:00
3d3388d59b
Extract volume init and removal from project.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:53:04 -05:00
e551988616
Include networks in the config_hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:52:03 -05:00
0810eeba10
Don't initialize networks that aren't used by any services.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:52:03 -05:00
8e838968fe
Refactor project network initlization.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:51:31 -05:00
e32863f89e
Make links unique-by-alias when merging
...
Factor out MergeDict from merge_service_dicts to reduce complexity below limit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:48:47 -05:00
bf6a5d3e49
Fix merging of lists with multiple files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:48:18 -05:00
c70c72f49a
Add depends_on to ALLOWED_KEYS
...
This ensures and already existing `depends_on` is not deleted when the service on which it is defined also employs `extends`.
Signed-off-by: Ryan Taylor Long <ryan@rtlong.com>
2016-02-02 10:48:18 -05:00
1152c5b25b
Tweak and test warning shown when version is a dict
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
ef8db3650a
Improve error messages for invalid versions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
aeef61fcd8
Make 'version' a string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:58:34 +00:00
a8de582425
Remove redundant check - self.config should never be None
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:47:44 +00:00
4ac004059a
Normalise/fix config field designators in validation messages
...
- Instead of "Service 'web' configuration key 'image'", just say
"web.image"
- Fix the "Service 'services'" bug in the v2 file format
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-02 13:47:43 +00:00
34ccb90d7e
Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-30 10:14:45 +02:00
b4868d0259
Fix race condition with up and setting signal handlers.
...
Also print stdout on wait_for_container().
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-29 13:04:04 -05:00
883e45626f
Merge pull request #2706 from dnephin/dont_copy_host_volumes
...
Don't copy host volumes on recreate
2016-01-28 15:02:53 -05:00
ca81672b82
Merge pull request #2761 from aanand/fix-bridge-plus-host
...
Remove ability to join bridge network + user-defined networks
2016-01-27 01:41:07 +00:00
650b0cec38
Remove ability to join bridge network + user-defined networks
...
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-27 00:42:09 +00:00
0ba02b4a18
Add back external links in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 18:48:43 +00:00
ed1b204804
Rename 'net' to 'network mode' in various classes/methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 23:55:20 +00:00
e566a4dc1c
Implement network_mode in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 23:24:55 +00:00
a267d8fe3c
Merge pull request #2728 from shin-/2709_service_volumes
...
Match named volumes in service definitions with declared volumes
2016-01-25 23:24:09 +00:00
af6b18cad8
Merge pull request #2746 from aanand/alias-containers-by-short-id
...
Alias containers by short id
2016-01-25 13:55:30 -08:00
313c584185
Alias containers by short id
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 16:14:21 +00:00
6540efb3d3
If an env var is passthrough but not defined on the host don't set it.
...
This doesn't change too much code and keeps the generators.
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2016-01-23 15:58:06 -05:00
139c7f7830
Move named volumes matching to config validation phase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-22 17:42:24 -08:00
48377a354f
is_named_volume also tests for home paths ~
...
Fix bug with VolumeSpec not being updated
Fix integration test
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-22 16:05:21 -08:00
3a72edb906
Network fields schema validation
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-22 16:42:10 +02:00
9e67eae311
Match named volumes in service definitions with declared volumes
...
Raise ConfigurationError for undeclared named volumes
Test new behavior
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-21 18:10:53 -08:00
6e73fb38ea
Fixes #2448
...
Signed-off-by: Alf Lervag <alf.lervag@bouvet.no>
Conflicts:
compose/cli/main.py
requirements.txt
2016-01-21 19:19:37 +00:00
f3e55568d1
Fix interactive run with networking
...
Make sure we connect the container to all required networks *after*
starting the container and *before* hijacking the terminal.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:42:59 +00:00
09dbc7b4cb
Stop connecting to all networks on container creation
...
This relies on an Engine behaviour which is a bug, not an intentional
feature - we have to connect to networks one at a time
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:04:50 +00:00
a14906fd35
Fix 'run' behaviour with networks
...
- Test that one-off containers join all networks
- Don't set any aliases
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 17:28:55 +00:00
1e51b7e88b
Merge pull request #2722 from aanand/fix-scale-race-condition
...
Fix scale race condition
2016-01-21 17:08:15 +00:00
013c5ea3f9
Merge pull request #2713 from aanand/links-v2
...
Support links in v2 files
2016-01-21 17:08:05 +00:00
7a4fdfd034
Merge pull request #2712 from jzvelc/fix_v2_service_extend
...
Fix `extends` when using v2 config format
2016-01-21 17:06:21 +00:00
642e71b4c7
Stop and remove containers in parallel when scaling down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 15:28:40 +00:00
755c49b500
Fix scale when containers exit immediately
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 15:19:55 +00:00
ee63075a34
Support links in v2 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 14:34:26 +00:00
907c3ce42b
Fix for extending services written in v2 format.
...
Signed-off-by: Jure Žvelc <jzvelc@gmail.com>
2016-01-20 18:46:16 +01:00
146587643c
Move ulimits validation to validation.py and improve the error message.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 15:47:57 -05:00
0bce467782
Implement depends_on to define an order for services in the v2 format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 15:41:45 -05:00
c39489f540
Don't copy over volumes that were previously host volumes, and are now container volumes.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-19 14:41:21 -05:00
c47aea9c12
Merge pull request #2698 from aanand/fix-name-is-reserved
...
Fix "name is reserved" with Engine 1.10 RC1
2016-01-19 10:15:06 -05:00
2106481c23
Fix "name is reserved" with Engine 1.10 RC1
...
Ensure link aliases are unique (this deduping was previously performed
on the server).
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-19 11:27:27 +00:00
5b2b4cbb07
Merge pull request #2692 from aanand/fix-tls-paramater-error
...
Catch TLSParameterErrors from docker-py
2016-01-19 11:25:21 +00:00
9ccef1ea91
Catch TLSParameterErrors from docker-py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 21:48:12 +00:00
afae365050
Allow custom ipam config
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 18:56:18 +00:00
e7673bf920
Allow overriding of config for the default network
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 16:17:39 +00:00
53d56ea245
Quote network names in error messages
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-18 16:15:52 +00:00
cce3b29688
Merge pull request #2665 from dnephin/check_extends_use_same_version
...
Validate that an extended config file has the same version as the base
2016-01-15 18:07:56 -05:00
dc1104649f
Validate that an extended config file has the same version as the base.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 22:28:20 -05:00
cba75627e1
Fix error when joining host/bridge network
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:46:24 +00:00
abd031cb3d
Containers join each network aliased to their service's name
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-15 02:08:20 +00:00
2a2eb81215
Merge pull request #2662 from dnephin/fix_config_printing_unicode
...
Fix config printing unicode objects
2016-01-14 19:26:39 -05:00
1bfbba36b2
Ensure that the config output by config command never contains python objects.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:33:58 -05:00
3021ee12fe
Fix `config` command to print the new sections of the config
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:28:17 -05:00
0f234154c2
Remove all non-external networks on down.
...
Also moves the shutdown test fixtures to be a more general v2-full fixture.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:28:17 -05:00
b98e2169e6
Error when the project name is invalid for the image name.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:25:23 -05:00
b689c4a218
Move service validation to validate_service().
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 18:25:22 -05:00
796d97e394
Merge pull request #2617 from gutweiler/extra-hosts-ipv6
...
Extra hosts ipv6
2016-01-14 15:19:12 -08:00
47e53b49c2
Merge pull request #2653 from shin-/Runscope-build-args
...
Support for build arguments
2016-01-14 23:13:54 +00:00
1ae57d92d4
Remove duplicate functions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-14 14:39:06 -08:00
ce9f2681a2
Fixes #1422 : ipv6 addr contains colons, so we split only by the first char.
...
Signed-off-by: Clemens Gutweiler <cg@vioma.de>
2016-01-14 22:26:35 +01:00
13063a96cb
Fix handling of service.dockerfile key
...
Made invalid in v2 format
Doesn't break build config anymore
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-14 12:15:37 -08:00
9cfa71ceee
Add support for build arguments
...
Allows 'build' configuration option to be specified as an
object and adds support for build args.
Signed-off-by: Garrett Heel <garrettheel@gmail.com>
2016-01-14 12:14:56 -08:00
79df2ebe1b
Support variable interpolation for volumes and networks sections.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 14:04:57 -05:00
d98b64f6e7
Remove duplicated logic from initialize_networks()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:09:45 +00:00
4e61377c6d
Move get_networks() out of Project class
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:01:44 +00:00
73fbd01cfe
Support the 'external' option for networks
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:00:39 +00:00
ca68c9faa4
Services can join 'bridge' or 'host'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:00:39 +00:00
e75629392d
Don't join the bridge network by default in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 18:00:39 +00:00
3eafdbb01b
Connect services to networks with the 'networks' key
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 17:59:37 +00:00
35e347cf92
Disable the use of 'net' in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 17:59:37 +00:00
69ed5f9c48
Specify networks in Compose file
...
There's not yet a proper way for services to join networks
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-14 17:59:36 +00:00
8fca4f1628
Merge pull request #2649 from dnephin/make_volumes_from_more_explicit
...
Make volumes from more explicit in V2 config format
2016-01-14 17:15:27 +00:00
172b955d79
Merge pull request #2646 from dnephin/docker_compose_down
...
docker-compose down
2016-01-14 11:59:02 -05:00
b76dc1e05e
Require volumes_from a container to be explicit in V2 config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:45:16 -05:00
c3968a439f
Refactor config loading to move version check into ConfigFile.
...
Adds the cached_property package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:45:15 -05:00
de949284f5
Refactor config loading for handling volumes_from in v2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:43:47 -05:00
dbe04a70f0
Merge pull request #2655 from shin-/updated_volume_definition
...
Properly validate volume definition
2016-01-14 16:37:39 +00:00
c64af0a459
Add an acceptance test and docs for the down subcommand
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 11:11:08 -05:00
c8ed156806
Adding docker-compose down
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-14 10:59:53 -05:00
18df1e170d
Merge pull request #2625 from kojiromike/allow-list-entrypoints
...
Allow Entrypoints to be Lists
2016-01-14 12:48:13 +00:00
7733600262
Merge pull request #2508 from jstewmon/stop_signal
...
add support for stop_signal to compose file
2016-01-14 12:46:04 +00:00
e41e6c1241
Properly validate volume definition
...
Test valid empty volume definitions
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-13 18:22:29 -08:00
153185eadb
Merge pull request #2647 from shin-/preexisting_volume_detection_rb1
...
Support for external volumes
2016-01-13 17:02:36 -08:00
59a4ab9634
Allow Entrypoints to be Lists
...
Signed-off-by: Michael A. Smith <msmith3@ebay.com>
2016-01-13 17:45:56 -05:00
e76b2679eb
external volume disallows other config keys
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-13 14:12:03 -08:00
c260eb910b
Merge pull request #2629 from dbonev/2611-support-port-range-in-compose
...
Port range in exposed ports
2016-01-13 13:09:22 -08:00
3aba5bb67e
Merge pull request #2620 from dbonev/2607-ulimits-not-merged-in-extended-services
...
Ulimits are now merged into extended services
2016-01-13 21:05:38 +00:00
d601199eb5
Normalize external_name
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-13 12:07:08 -08:00
8616b2de51
Update error message when external volume is missing
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-13 11:23:06 -08:00
bf48a781db
Add flag for stops all containers if any container was stopped.
...
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
2016-01-13 13:12:09 +03:00
9cb58b796e
Implement ability to specify external volumes
...
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-12 16:53:49 -08:00
05935b5e54
Don't recreate pre-existing volumes.
...
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-12 15:42:42 -08:00
5d8c2d3cec
add support for stop_signal to compose file
...
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
2016-01-12 17:21:49 -06:00
3a46abd17f
Allowed port range in exposed ports
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-13 00:13:04 +02:00
2f07e2ac36
Ulimits are now merged into extended services
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-12 23:59:23 +02:00
70cce961a8
Don't allow links or external_links in v2 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:45 +00:00
9e17cff0ef
Refactor API version switching logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:45 +00:00
a027a0079c
Use networking for version 2 Compose files
...
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
with the 'networks' key
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:29:40 +00:00
1a66543461
Make the default network name '{project name}_default'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-12 21:08:28 +00:00
e98ab0e534
Allow both image and build together.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 14:10:00 -05:00
ed4db542d6
Fix pep8 errors from the new pep8 release.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 14:02:30 -05:00
12b5405420
Fix pre-commit on master.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-12 13:27:18 -05:00
304a44aeab
Merge pull request #2585 from dnephin/short_signal_handlers
...
Fix signal handlers by moving shutdown logic out of handler
2016-01-12 12:55:53 -05:00
52e50a9d9a
Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key
...
Move logging config under separate key in v2 compose files
2016-01-12 15:21:10 +00:00
063a25ae7d
Merge pull request #2392 from dnephin/docker_compose_events
...
docker-compose events
2016-01-12 11:45:27 +00:00
46a474ecd9
Move v1-v2 config normalization to separate function.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-11 15:53:28 -08:00
c32991a8d4
Remove superfluous service code
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-11 15:39:59 -08:00
d3cd038b84
Update event field names to match the new API fields.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-11 11:51:17 -05:00
46585fb8e1
Support legacy logging options format
...
Additional test for legacy compose file.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-08 14:37:07 -08:00
fc57fc1dc1
Merge pull request #2609 from dnephin/dont_warn_on_container_volume
...
Don't warn when the container volume is a compose option
2016-01-08 17:18:02 -05:00
ab98c70dd1
Merge pull request #2612 from dnephin/merge_extends_from_multiple_files
...
Fix extends with multiple files
2016-01-08 17:17:41 -05:00
21aae13e77
Move logging config changes to v2 spec
...
Reorganize JSON schemas
Update fixtures
Update service validation function
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-08 13:21:45 -08:00
Michael Friis
Victoria Bialas
Misty Stanley-Jones
Juan Eugenio Abadie
Nick van der Meij
Zhe Zhang
Alex Urquhart
John Mulhausen
Tim Smid
Joffrey F
Jari Takkala
Aanand Prasad
Yong Wen Chua
Misty Stanley-Jones
Victoria Bialas
Joffrey F
LRubin
Sergei
Peter Dave Hello
Dan Keder
buuren
Dan Shumaker
Adam Stevenson
Aurelien HAVET
Bo-Yi Wu
Ryan Ore
Varentsov
Rares Vernica
Joe Lemmer
Andreas Kohn
Jeffery Bradberry
Kevin Conboy
David Williamson
Jonas Friedmann
Gaetan
Adrien Duermael
michael-wise
dave-pollock
Markus Schulte
Aleksandar Nikolić
Joao Fernandes
DavidRabel-b1
Ivan Perez
Bin Liu
ezeeetm
nVitius
Ibragimov Ruslan
BSCheshir
sixcorners
Pascal Borreli
Ben Firshman
Tomas Tomecek
Daniel Nephin
Sander Maijers
Andrey Devyatkin
Anton Simernia
Thom Linton
Aaron Nall
Daniel Nephin
johnharris85
Vladimir Lagunov
Danyal Prout
twitherspoon
Tony Witherspoon
Kalle Møller
Philip Walls
Thomas Grainger
Simon van der Veldt
Ilya Skriblovsky
Matt Daue
Dimitar Bonev
Stéphane Seguin
Jesus
Richard Bann
Spencer Rinehart
Lukas Waslowski
jrabbit
Ryan Taylor Long
Alf Lervag
Jure Žvelc
Clemens Gutweiler
Garrett Heel
Michael A. Smith
Evgeniy Dobrohvalov
Jonathan Stewmon