summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | Fix imports orderingUlysses Souza2019-05-23
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6721 from ulyssessouza/fix-release-finalizeUlysses Souza2019-05-23
|\ \ | | | | | | Fix 'finalize' command on release script
| * | Fix 'finalize' command on release scriptUlysses Souza2019-05-23
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6719 from ulyssessouza/fix-release-scriptUlysses Souza2019-05-22
|\ \ | |/ |/| Fix release script for null user
| * Fix release script for null userUlysses Souza2019-05-22
|/ | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* Merge pull request #6666 from joakimr-axis/armpurgeUlysses Souza2019-05-22
|\ | | | | Purge Dockerfile.armhf which is no longer needed
| * Purge Dockerfile.armhf which is no longer neededJoakim Roubert2019-04-23
| | | | | | | | | | | | | | | | Current Dockerfile builds fine for armhf and thus the outdated Dockerfile.armhf is unnecessary. Change-Id: Idafdb9fbddedd622c2c0aaddb1d5331d81cfe57d Signed-off-by: Joakim Roubert <joakimr@axis.com>
* | Merge pull request #6715 from ulyssessouza/bump-dockerpy-401Ulysses Souza2019-05-22
|\ \ | | | | | | Bump docker-py 4.0.1
| * | Bump docker-py 4.0.1Ulysses Souza2019-05-22
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6649 from GeyseR/requests_upgradeIan Campbell2019-05-21
|\ \ | | | | | | support requests up to 2.22.0 version
| * | support requests up to 2.22.x versionSergey Fursov2019-05-21
|/ / | | | | | | Signed-off-by: Sergey Fursov <geyser85@gmail.com>
* | Merge pull request #6342 from collin5/b5547Ian Campbell2019-05-20
|\ \ | | | | | | --remove-orphans is ignored when using up --no-start
| * | remove stopped containers on --remove-orphansCollins Abitekaniza2019-01-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com> kill orphan containers, catch APIError Exception Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com> test remove orphans with --no-start Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
* | | Merge pull request #6624 from orisano/feat-empty-cache-fromIan Campbell2019-05-20
|\ \ \ | | | | | | | | feat: drop empty tag on cache_from
| * | | feat: drop empty tag on cache_fromNao YONASHIRO2019-05-20
| | | | | | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
* | | | Merge pull request #6695 from Inconnu08/fix_depreciationUlysses Souza2019-05-20
|\ \ \ \ | | | | | | | | | | fixes warn method is deprecated
| * | | | fix warning method is deprecated with testsInconnu082019-05-15
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
* | | | Merge pull request #6707 from ulyssessouza/clean-containers-before-rmUlysses Souza2019-05-15
|\ \ \ \ | | | | | | | | | | Remove remaining containers on test_build_run
| * | | | Remove remaining containers on test_build_runUlysses Souza2019-05-14
| |/ / / | | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | | Merge pull request #6654 from jkldgoefgkljefogeg/masterUlysses Souza2019-05-14
|\ \ \ \ | | | | | | | | | | fix #6579 cli ps --all
| * | | | fix #6579 cli ps --allnoname2019-05-13
|/ / / / | | | | | | | | | | | | Signed-off-by: Seedf <github_commit@nohdmi.com>
* | | | Merge pull request #6700 from ulyssessouza/bump_urllib3Ulysses Souza2019-05-13
|\ \ \ \ | |/ / / |/| | | Bump urllib3
| * | | Bump urllib3ulyssessouza2019-05-12
|/ / / | | | | | | | | | Signed-off-by: ulyssessouza <ulysses.souza@docker.com>
* | | Merge pull request #6657 from ulyssessouza/skip_race_condition_testDjordje Lukic2019-04-19
|\ \ \ | | | | | | | | Avoid race condition on test
| * | | Avoid race condition on testUlysses Souza2019-04-19
|/ / / | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | Merge pull request #6641 from ulyssessouza/dockerfiles_refactorUlysses Souza2019-04-19
|\ \ \ | |/ / |/| | Refactor Dockerfiles for generating musl binaries
| * | Workaround race conditions on testsUlysses Souza2019-04-17
| | | | | | | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | Refactor release and build scriptsUlysses Souza2019-04-17
| | | | | | | | | | | | | | | | | | | | | | | | - Make use of the same Dockerfile when producing an image for testing and for deploying to DockerHub Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
| * | Refactor Dockerfiles for generating musl binariesUlysses Souza2019-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Refactor Dockerfile to be used for tests and distribution on docker hub on debian and alpine to use for final usage and also tests - Adapt test scripts to the new Dockerfiles' structure - Adapt Jenkinsfile to add alpine to the test matrix Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | Merge pull request #6632 from ulyssessouza/update-releasedocsUlysses Souza2019-04-04
|\| | | | | | | | Update release process on updating docs
| * | Update release process on updating docsUlysses Souza2019-04-04
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6618 from ulyssessouza/bump-1.24.0-changelogUlysses Souza2019-03-29
|\ \ | | | | | | Bump 1.24.0 changelog on master
| * | "Bump 1.24.0"Djordje Lukic2019-03-28
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6615 from ulyssessouza/bump-docker-py-3.7.2Djordje Lukic2019-03-28
|\ \ | | | | | | Bump docker-py 3.7.2
| * | Bump docker-py 3.7.2Ulysses Souza2019-03-28
|/ / | | | | | | Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | Merge pull request #6592 from treatwell/6589-depends_on-recreation-fixIan Campbell2019-03-26
|\ \ | | | | | | Fixed depends_on recreation behaviour for issue #6589
| * | Fixed depends_on recreation behaviour for issue #6589joeweoj2019-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously any containers which did *not* have any links were always recreated. In order to fix depends_on and preserve expected links recreation behaviour, we now only use the ConvergenceStrategy.always recreation strategy for a service if any of the the following conditions are true: * --always-recreate-deps flag provided * service container is stopped * service defines links but the container does not have any * container has links but the service definition does not Signed-off-by: joeweoj <joewardell@gmail.com>
* | | Merge pull request #6610 from ulyssessouza/fix-httperror-no-attribute-messageUlysses Souza2019-03-25
|\ \ \ | | | | | | | | Fix script for the case of release file already present on pypi
| * | | Fix script for release file already present caseUlysses Souza2019-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a: "AttributeError: 'HTTPError' object has no attribute 'message'" Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | | Merge pull request #6494 from collin5/b6464Ian Campbell2019-03-25
|\ \ \ \ | |/ / / |/| | | Only pull images that can't build `docker-compose pull`
| * | | only pull images that can't buildCollins Abitekaniza2019-03-24
| | | | | | | | | | | | | | | | Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
* | | | Merge pull request #6604 from ulyssessouza/fix-release-resourcesUlysses Souza2019-03-22
|\ \ \ \ | | | | | | | | | | Fix release resources
| * | | | 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>
* | | | | Merge pull request #6594 from ulyssessouza/bump-docker-py-to-3.7.1Ulysses Souza2019-03-21
|\ \ \ \ \ | |_|_|/ / |/| | | | Bump docker-py version to 3.7.1
| * | | | Bump docker-py version to 3.7.1Ulysses Souza2019-03-20
|/ / / / | | | | | | | | | | | | | | | | | | | | This docker-py version includes ssh fixes Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
* | | | Merge pull request #6578 from bfirsh/bootloader-ignore-signalsChris Crone2019-03-15
|\| | | | | | | | | | | Enable bootloader_ignore_signals in pyinstaller
| * | | Enable bootloader_ignore_signals in pyinstallerBen Firshman2019-03-12
|/ / / | | | | | | | | | | | | | | | Fixes #3347 Signed-off-by: Ben Firshman <ben@firshman.co.uk>