summaryrefslogtreecommitdiff
path: root/compose
Commit message (Expand)AuthorAge
* Make environment variables without a value the same as docker-cli.Daniel Nephin2016-02-23
* Revert "Change special case from '_', None to ()"Daniel Nephin2016-02-23
* Merge pull request #2995 from dnephin/fix_warning_about_boolsDaniel Nephin2016-02-23
|\
| * Fix warning about boolean values.Daniel Nephin2016-02-22
* | Merge pull request #2996 from dnephin/fix_abort_on_container_exitDaniel Nephin2016-02-23
|\ \ | |/ |/|
| * Stop other containers if the flag is set.Daniel Nephin2016-02-22
| * Add failing test for --abort-on-container-exitRichard Bann2016-02-22
* | Merge pull request #2975 from dnephin/fix_crash_on_none_in_configDaniel Nephin2016-02-19
|\ \
| * | Fix validation message when there are multiple ested oneOf validations.Daniel Nephin2016-02-19
| |/
* | Make config validation error messages more consistent.Daniel Nephin2016-02-19
* | Validate that each section of the config is a mapping before running interpol...Daniel Nephin2016-02-19
|/
* Use modern set notation in _get_aliasesJoffrey F2016-02-18
* Handle mismatched network formats in config filesJoffrey F2016-02-18
* Network aliases are now part of the network dictionaryJoffrey F2016-02-18
* Fix network list serialization in py3Joffrey F2016-02-18
* Test network_aliases featureJoffrey F2016-02-18
* Allow user to specify custom network aliasesJoffrey F2016-02-18
* Merge pull request #2938 from shin-/2927-buildargs-typesJoffrey F2016-02-18
|\
| * Apply driver_opts processing to network configsJoffrey F2016-02-18
| * Constraint build argument types. Numbers are cast into stringsJoffrey F2016-02-17
* | Only set a container affinity if there are volumes to copy over.Daniel Nephin2016-02-17
* | Fix copying of volumes by using the name of the volume instead of the host path.Daniel Nephin2016-02-17
|/
* Merge pull request #2893 from shin-/2833-run-dependenciesDaniel Nephin2016-02-12
|\
| * Bring up all dependencies when running a single service.Joffrey F2016-02-12
* | driver_opts can only be of type stringJoffrey F2016-02-12
* | Merge pull request #2882 from shin-/2715-old-server-errorJoffrey F2016-02-11
|\ \
| * | Detailed error message when daemon version is too old.Joffrey F2016-02-11
* | | Merge pull request #2877 from dnephin/fix_merging_buildDaniel Nephin2016-02-11
|\ \ \ | |_|/ |/| |
| * | Fix build section without context.Daniel Nephin2016-02-11
| |/
* / Add logging when initializing a volume.Joffrey F2016-02-11
|/
* Merge pull request #2878 from dnephin/merge_build_argsAanand Prasad2016-02-11
|\
| * Merge build.args when merging services.Daniel Nephin2016-02-10
* | Fix sorting of DOCKER_START_KEYS.Spencer Rinehart2016-02-10
* | Add support for shm_size. Fixes #2823.Spencer Rinehart2016-02-10
|/
* Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-mergingAanand Prasad2016-02-10
|\
| * Handle the 'network_mode' key when merging multiple compose files.Lukas Waslowski2016-02-08
| * Correctly merge the 'services/<service>/networks' key in the case of multiple...Lukas Waslowski2016-02-08
* | Merge pull request #2853 from dnephin/fix_short_id_aliasDaniel Nephin2016-02-09
|\ \
| * | Use 12 characters for the short id to match docker and fix backwards compatib...Daniel Nephin2016-02-08
| |/
* | Merge pull request #2734 from jrabbit/empty-env-var-2359Joffrey F2016-02-08
|\ \ | |/ |/|
| * Change special case from '_', None to ()jrabbit2016-02-06
| * If an env var is passthrough but not defined on the host don't set it.jrabbit2016-01-23
* | Bump 1.7.0devAanand Prasad2016-02-04
* | Update docker-py and dockerptyAanand Prasad2016-02-04
* | Merge pull request #2808 from aanand/connect-before-startDaniel Nephin2016-02-03
|\ \
| * | Connect container to networks before starting itAanand Prasad2016-02-02
* | | Merge pull request #2782 from dbonev/2772-compose-project-name-emptyDaniel Nephin2016-02-02
|\ \ \
| * | | Falling back to default project name when COMPOSE_PROJECT_NAME is set to emptyDimitar Bonev2016-01-30
* | | | Merge pull request #2785 from dnephin/depends_on_with_extendsDaniel Nephin2016-02-02
|\ \ \ \ | |_|/ / |/| | |
| * | | Make links unique-by-alias when mergingDaniel Nephin2016-02-02