summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Remove set -x to make this script less verboseJean-Christophe Sirot2019-10-09
| | | | Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>
* Add dependencies for ARM build (#6908)Nicolas De loof2019-10-09
|\ | | | | Add dependencies for ARM build
| * Enhance build script for different CPU architecturesStefan Scherer2019-10-09
| | | | | | | | Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
| * Add dependencies for ARM buildStefan Scherer2019-10-09
|/ | | | Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
* Fix "extends" same file optimization (#6425)Nicolas De loof2019-10-09
|\ | | | | Fix "extends" same file optimization
| * Fix same file 'extends' optimizationAleksandr Mezin2019-10-09
| | | | | | | | Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
| * Add test to verify same file 'extends' optimizationAleksandr Mezin2019-10-09
|/ | | | Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
* [TAR-995] ADDED a stage for executing License Scans (#6875)Nicolas De loof2019-10-08
|\ | | | | [TAR-995] ADDED a stage for executing License Scans
| * ADDED a stage for executing License ScansZuhayr Elahi2019-09-13
| | | | | | | | Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
* | Merge pull request #6864 from samueljsb/formatter_classNicolas De loof2019-10-08
|\ \ | | | | | | Change Formatter.table method to staticmethod
| * | Change Formatter.table method to staticmethodSamuel Searles-Bryant2019-08-22
| | | | | | | | | | | | | | | | | | | | | Make this a staticmethod so it's easier to use without needing to init a Formatter object first. Signed-off-by: Samuel Searles-Bryant <samuel.searles-bryant@unipart.io>
* | | Add automatic labeling of bug, feature & question issues (#6944)Nicolas De loof2019-10-08
|\ \ \ | | | | | | | | Add automatic labeling of bug, feature & question issues
| * | | Add automatic labeling of bug, feature & question issuesGuillaume LOURS2019-10-08
| | | | | | | | | | | | | | | | Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
* | | | Merge pull request #6912 from cranzy/fixing_broken_linkNicolas De loof2019-10-08
|\ \ \ \ | |/ / / |/| | | Fixing features broken link
| * | | Fixing features broken linkDimitar Dimitrov2019-09-24
| | | | | | | | | | | | | | | | Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@docker.com>
* | | | Merge pull request #6914 from lukas9393/6913-progress-argUlysses Souza2019-10-07
|\ \ \ \ | | | | | | | | | | Fix --progress arg when run docker-compose build
| * | | | Fix --progress arg when run docker-compose buildLukas Hettwer2019-09-24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | --progress is no longer processed as flag but as argument with value. Signed-off-by: Lukas Hettwer <lukas.hettwer@aboutyou.de> Resolve: [#6913]
* | | | Merge pull request #6925 from ulyssessouza/fix-secrets-warning-messageGuillaume LOURS2019-09-27
|\ \ \ \ | |/ / / |/| | | Fix secret missing warning
| * | | Fix secret missing warningulyssessouza2019-09-27
|/ / / | | | | | | | | | Signed-off-by: ulyssessouza <ulyssessouza@gmail.com>
* | | Merge pull request #6131 from sagarafr/fix-5920-missing-secret-messageUlysses Souza2019-09-09
|\ \ \ | | | | | | | | Add a warning message to secret file
| * | | Add tests to 'get_secret' warningsUlysses Souza2019-09-09
| | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | | Fix missing secret error messageMarian Gappa2019-09-09
|/ / / | | | | | | | | | | | | | | | | | | | | | Add a warning message when the secret file doesn't exist Fixes #5920 Signed-off-by: Marian Gappa <marian.gappa@gmail.com>
* | | Merge pull request #6862 from deathtracktor/masterSilvin Lubecki2019-09-06
|\ \ \ | | | | | | | | Fix KeyError when remote network labels are None.
| * | | Prevent KeyError when remote network labels are None.Danil Kister2019-09-05
| |/ / | | | | | | | | | Signed-off-by: Danil Kister <danil.kister@gmail.com>
* | | Merge pull request #6882 from ulyssessouza/fix_attach_restarting_containerUlysses Souza2019-09-05
|\ \ \ | |_|/ |/| | Fix race condition on watch_events
| * | Fix race condition on watch_eventsUlysses Souza2019-09-04
|/ / | | | | | | | | | | | | | | Avoid to attach to restarting containers and ignore race conditions when trying to attach to already dead containers Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6878 from ulyssessouza/bump-debianChris Crone2019-08-30
|\ \ | | | | | | Bump runtime debian
| * | Bump runtime debianUlysses Souza2019-08-29
| | | | | | | | | | | | | | | | | | From `stretch-20190708-slim` to `stretch-20190812-slim` Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | Merge pull request #6865 from ulyssessouza/support-cli-buildUlysses Souza2019-08-30
|\ \ \ | |/ / |/| | Add support to CLI build
| * | Rename envvar switch to COMPOSE_DOCKER_CLI_BUILDUlysses Souza2019-08-30
| | | | | | | | | | | | | | | | | | From `COMPOSE_NATIVE_BUILDER` to `COMPOSE_DOCKER_CLI_BUILD` Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | Add comment on native build and fix typoUlysses Souza2019-08-29
| | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | fix: use subprocess32 for python2Nao YONASHIRO2019-08-29
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
| * | Add integration tests to native builderUlysses Souza2019-08-29
| | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | Rephrase warnings when building with the cliUlysses Souza2019-08-28
| | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | feat: add a warning if someone uses the --compress or --parallel flagNao YONASHIRO2019-08-28
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
| * | feat: add --progress flagNao YONASHIRO2019-08-28
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
| * | fix: add build flagsNao YONASHIRO2019-08-28
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
| * | Add support to CLI buildNao YONASHIRO2019-08-28
|/ / | | | | | | | | | | | | | | | | This includes can be enabled by setting the env var `COMPOSE_NATIVE_BUILDER=1`. Signed-off-by: Nao YONASHIRO <yonashiro@r.recruit.co.jp> Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6631 from chibby0ne/update_jsonschema_dependencyDjordje Lukic2019-08-22
|\ \ | |/ |/| requirements: update jsonschema dependency
| * requirements: update jsonschema dependencyAntonio Gutierrez2019-07-27
| | | | | | | | | | | | Fixes: https://github.com/docker/compose/issues/6347 Signed-off-by: Antonio Gutierrez <chibby0ne@gmail.com>
* | Merge pull request #6856 from aiordache/bump-alpineUlysses Souza2019-08-21
|\ \ | | | | | | update alpine version to 3.10.1
| * | update alpine version to 3.10.1aiordache2019-08-20
|/ / | | | | | | Signed-off-by: aiordache <anca.iordache@docker.com>
* | Merge pull request #6826 from ulyssessouza/env_override_integration_testJean-Christophe Sirot2019-07-31
|\ \ | |/ |/| Add integration tests regarding environment
| * Add integration tests regarding environmentUlysses Souza2019-07-31
|/ | | | | | This covers what was included in #6800 Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* Merge pull request #6800 from KlaasH/revise-env-file-optionDjordje Lukic2019-07-25
|\ | | | | Make '--env-file' option top-level only and fix failure with subcommands
| * Add shell completions for --env-file optionKlaas Hoekema2019-07-24
| | | | | | | | | | | | | | Adds completions for the --env-file toplevel option to the bash, fish, and zsh completions files. Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
| * Pass toplevel_environment to run_one_off_containerKlaas Hoekema2019-07-24
| | | | | | | | | | | | | | | | | | Instead of passing `project_dir` from `TopLevelCommand.run` to `run_one_off_container` then using it there to load the toplevel environment (duplicating the logic that `TopLevelCommand.toplevel_environment` encapsulates), pass the Environment object. Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
| * Fix typo in 'split_env' error messageKlaas Hoekema2019-07-24
| | | | | | | | Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
| * Call TopLevelCommand's environment 'toplevel_environment'Klaas Hoekema2019-07-24
| | | | | | | | | | | | | | | | | | To help prevent confusion between the different meanings and sources of "environment", rename the method that loads the environment from the .env or --env-file (i.e. the one that applies at a project level) to 'toplevel_environment'. Signed-off-by: Klaas Hoekema <khoekema@azavea.com>
| * Handle environment file override within TopLevelCommandKlaas Hoekema2019-07-24
|/ | | | | | | | | | Several (but not all) of the subcommands are accepting and processing the `--env-file` option, but only because they need to look for a specific value in the environment. The work of applying the override makes more sense as the domain of TopLevelCommand, and moving it there and removing the option from the subcommands makes things simpler. Signed-off-by: Klaas Hoekema <khoekema@azavea.com>