summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Trim trailing whitespace.Felipe Sateler2019-11-22
| | | | | Fixes lintian: file-contains-trailing-whitespace See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.
* Update changelogFelipe Sateler2019-11-22
|
* Drop pydist-overrides and update debian/control versionsFelipe Sateler2019-11-22
| | | | Since docker-compose is python3 it was not used.
* Start new changelogFelipe Sateler2019-11-22
|
* Drop Relax-Dependencies.patch - now dependencies are less strictFelipe Sateler2019-11-22
|
* Update upstream source from tag 'upstream/1.25.0'Felipe Sateler2019-11-22
|\ | | | | | | Update to upstream version '1.25.0' with Debian dir 01225dadf264cb86293071829641cb341942031d
| * New upstream version 1.25.0Felipe Sateler2019-11-22
| |\
| | * Merge pull request #7028 from docker/bump-1.25.0Ulysses Souza2019-11-18
| | |\ | | | | | | | | Bump 1.25.0
| | | * Add latest tag question on resume and start to tag on buildUlysses Souza2019-11-18
| | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * "Bump 1.25.0"Ulysses Souza2019-11-18
| | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * "Bump 1.25.0"Ulysses Souza2019-11-18
| | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * "Bump 1.25.0"Ulysses Souza2019-11-18
| | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * Merge remote-tracking branch 'upstream/release' into bump-1.25.0Ulysses Souza2019-11-18
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #6987 from docker/bump-1.25.0-rc4Djordje Lukic2019-10-28
| | |\ \ | | | | | | | | | | Bump 1.25.0-rc4
| | | * | "Bump 1.25.0-rc4"Djordje Lukic2019-10-28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
| | | * | Merge remote-tracking branch 'origin/release' into bump-1.25.0-rc4Djordje Lukic2019-10-28
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #6984 from docker/bump-1.25.0-rc3Djordje Lukic2019-10-28
| | |\ \ \ | | | | | | | | | | | | Bump 1.25.0-rc3
| | | * | | "Bump 1.25.0-rc3"Djordje Lukic2019-10-28
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
| | | * | | Merge remote-tracking branch 'origin/release' into bump-1.25.0-rc3Djordje Lukic2019-10-28
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #6835 from docker/bump-1.25.0-rc2Ulysses Souza2019-08-07
| | |\ \ \ \ | | | | | | | | | | | | | | Bump 1.25.0-rc2
| | | * | | | "Bump 1.25.0-rc2"Ulysses Souza2019-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | Merge remote-tracking branch 'upstream/release' into bump-1.25.0-rc2Ulysses Souza2019-08-06
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #6766 from docker/bump-1.24.1Djordje Lukic2019-06-24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Bump 1.24.1
| | | * | | | | "Bump 1.24.1"Djordje Lukic2019-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
| | | * | | | | Bump docker-pyDjordje Lukic2019-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
| | | * | | | | Add .fossa.yml fileDave Tucker2019-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a .fossa.yml file used by fossa.io It allows for fossa to scan the dependencies and figure out which oss licenses are in use. This can be added to CI at some point in the near future. Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
| | | * | | | | Merge remote-tracking branch 'origin/release' into bump-1.24.1Djordje Lukic2019-06-24
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #6726 from docker/bump-1.25.0-rc1Ulysses Souza2019-05-24
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | Bump 1.25.0-rc1
| | | * | | | | "Bump 1.25.0-rc1"Ulysses Souza2019-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | Merge remote-tracking branch 'upstream/release' into bump-1.25.0-rc1Ulysses Souza2019-05-23
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge pull request #6616 from docker/bump-1.24.0Ulysses Souza2019-03-28
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump 1.24.0
| | | * | | | | | "Bump 1.24.0"Ulysses Souza2019-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Bump docker-py 3.7.2Ulysses Souza2019-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Fix script for release file already present caseUlysses Souza2019-03-28
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a: "AttributeError: 'HTTPError' object has no attribute 'message'" Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | * | | | | | Merge pull request #6609 from docker/bump-1.24.0-rc3Ulysses Souza2019-03-22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Bump 1.24.0-rc3
| | | * | | | | | "Bump 1.24.0-rc3"Ulysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Fix bintray docker-compose linkUlysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Fix typo on finalizeUlysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Use os.system() instead of run_setup()Ulysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `os.system()` instead of `run_setup()` because the last is not taking any effect Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Bump docker-py version to 3.7.1Ulysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This docker-py version includes ssh fixes Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Enable bootloader_ignore_signals in pyinstallerBen Firshman2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3347 Signed-off-by: Ben Firshman <ben@firshman.co.uk>
| | | * | | | | | Added test case to verify fix for #6525Michael Irwin2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Irwin <mikesir87@gmail.com>
| | | * | | | | | Fix merging of compose files when network has None configMichael Irwin2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Irwin <mikesir87@gmail.com> Resolves #6525
| | | * | | | | | circleci: Fix virtualenv version to 16.2.0Christopher Crone2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Crone <christopher.crone@docker.com>
| | | * | | | | | Fix Flake8 lintUlysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes extra indentation and replace the use of `is` by `==` when comparing strings Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| | | * | | | | | Dockerfile: Force version of virtualenv to 16.2.0Christopher Crone2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Crone <christopher.crone@docker.com>
| | | * | | | | | script.build.linux: Do not tail image build logsChristopher Crone2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Crone <christopher.crone@docker.com>
| | | * | | | | | requirements-dev: Fix version of mock to 2.0.0Christopher Crone2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Crone <christopher.crone@docker.com>
| | | * | | | | | macOS: Bump Python and OpenSSLChristopher Crone2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christopher Crone <christopher.crone@docker.com>
| | | * | | | | | Add `--parallel` to `docker build`'s options in `bash` and `zsh` completionUlysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>