a89128118b
Merge pull request #6342 from collin5/b5547
...
--remove-orphans is ignored when using up --no-start
2019-05-20 15:45:24 +01:00
263d18ce93
Merge pull request #6624 from orisano/feat-empty-cache-from
...
feat: drop empty tag on cache_from
2019-05-20 15:35:48 +01:00
51ee6093df
feat: drop empty tag on cache_from
...
Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
2019-05-20 23:32:15 +09:00
9de6ec3700
Merge pull request #6695 from Inconnu08/fix_depreciation
...
fixes warn method is deprecated
2019-05-20 12:34:51 +02:00
99e67d0c06
fix warning method is deprecated with tests
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-05-15 23:46:12 +06:00
75d5eb0108
Merge pull request #6707 from ulyssessouza/clean-containers-before-rm
...
Remove remaining containers on test_build_run
2019-05-15 11:44:37 +02:00
8a9575bd0d
Remove remaining containers on test_build_run
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-05-14 19:13:21 +02:00
b612361541
Merge pull request #6654 from jkldgoefgkljefogeg/master
...
fix #6579 cli ps --all
2019-05-14 11:53:04 +02:00
c2783d6f88
fix #6579 cli ps --all
...
Signed-off-by: Seedf <github_commit@nohdmi.com>
2019-05-13 18:56:43 -07:00
a5b13f369d
Merge pull request #6700 from ulyssessouza/bump_urllib3
...
Bump urllib3
2019-05-13 14:07:21 +02:00
3a47000e71
Bump urllib3
...
Signed-off-by: ulyssessouza <ulysses.souza@docker.com>
2019-05-12 13:33:38 +02:00
79557e3d3a
Merge pull request #6657 from ulyssessouza/skip_race_condition_test
...
Avoid race condition on test
2019-04-19 16:37:14 +02:00
f2dc923084
Avoid race condition on test
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-19 15:53:02 +02:00
8a89d94e15
Merge pull request #6641 from ulyssessouza/dockerfiles_refactor
...
Refactor Dockerfiles for generating musl binaries
2019-04-19 11:46:41 +02:00
e047169315
Workaround race conditions on tests
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-17 17:59:12 +02:00
2b24eb693c
Refactor release and build scripts
...
- 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>
2019-04-17 16:08:33 +02:00
c217bab7f6
Refactor Dockerfiles for generating musl binaries
...
- 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>
2019-04-17 16:08:33 +02:00
5265f63c34
Merge pull request #6632 from ulyssessouza/update-releasedocs
...
Update release process on updating docs
2019-04-04 15:05:49 +02:00
9e3d9f6681
Update release process on updating docs
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-04-04 11:51:12 +02:00
41c8df39fe
Merge pull request #6618 from ulyssessouza/bump-1.24.0-changelog
...
Bump 1.24.0 changelog on master
2019-03-29 14:38:20 +01:00
ef10c1803f
"Bump 1.24.0"
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 19:38:25 +01:00
ada945c5cd
Merge pull request #6615 from ulyssessouza/bump-docker-py-3.7.2
...
Bump docker-py 3.7.2
2019-03-28 18:15:30 +01:00
ac148bc1ca
Bump docker-py 3.7.2
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 17:45:03 +01:00
e84ffb6aeb
Merge pull request #6592 from treatwell/6589-depends_on-recreation-fix
...
Fixed depends_on recreation behaviour for issue #6589
2019-03-26 14:06:14 +00:00
8a339946fa
Fixed depends_on recreation behaviour for issue #6589
...
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>
2019-03-26 11:48:20 +00:00
b2723d6b3d
Merge pull request #6610 from ulyssessouza/fix-httperror-no-attribute-message
...
Fix script for the case of release file already present on pypi
2019-03-25 17:18:59 +01:00
6ccbb56fec
Merge pull request #6494 from collin5/b6464
...
Only pull images that can't build `docker-compose pull`
2019-03-25 13:25:32 +00:00
c6dd7da15e
only pull images that can't build
...
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
2019-03-24 01:05:30 +03:00
154d7c1722
Fix script for release file already present case
...
This avoids a:
"AttributeError: 'HTTPError' object has no attribute 'message'"
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 17:14:18 +01:00
fc757fb4f5
Merge pull request #6604 from ulyssessouza/fix-release-resources
...
Fix release resources
2019-03-22 11:52:36 +01:00
2948c396a6
Fix bintray docker-compose link
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
15f8c30a51
Fix typo on finalize
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
cd1fcd3ea5
Use os.system() instead of run_setup()
...
Use `os.system()` instead of `run_setup()` because the last
is not taking any effect
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:36 +01:00
1e4fde8aa7
Bump docker-py version to 3.7.1
...
This docker-py version includes ssh fixes
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:22:11 +01:00
a27448bdab
Merge pull request #6594 from ulyssessouza/bump-docker-py-to-3.7.1
...
Bump docker-py version to 3.7.1
2019-03-21 10:30:54 +01:00
dc712bfa23
Bump docker-py version to 3.7.1
...
This docker-py version includes ssh fixes
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-20 18:03:41 +01:00
3b846ac8de
Merge pull request #6578 from bfirsh/bootloader-ignore-signals
...
Enable bootloader_ignore_signals in pyinstaller
2019-03-15 11:48:33 +01:00
0863785e96
Enable bootloader_ignore_signals in pyinstaller
...
Fixes #3347
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2019-03-12 12:25:35 -04:00
c6c57fcf49
Merge pull request #6518 from ulyssessouza/bump-python-37
...
Bump python 3.6.8 -> 3.7.2
2019-03-08 12:05:55 +00:00
733b827f85
Merge pull request #6544 from CatEars/secrets-added-after-container
...
Add test and implementation for secret added after container has been…
2019-03-08 11:21:00 +00:00
853215acf6
Remove project.stop() in test
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
87935893fc
Update data for unit tests
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
aa79fb2473
Ensure test passes
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
76d0406fab
Add test and implementation for secret added after container has been created
...
The issue is that if a secret is added to the compose file, then it will
not notice that containers have diverged since last run, because secrets
are not part of the config_hash, which determines if the configuration of
a service is the same or not.
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
a1f3cb6d89
Merge pull request #6546 from ijc/update-docs-branch
...
docs/README.md: update since `vnext-compose` branch is no longer used.
2019-03-07 20:31:43 +01:00
7bf9963cd6
Merge pull request #6547 from kudos/bugfix/scale-zero-default
...
Fix scale attribute to accept 0 as a value
2019-03-07 15:40:14 +00:00
d8e390eb9f
Added test case to verify fix for #6525
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2019-03-07 15:30:11 +01:00
3f1d41a97e
Fix merging of compose files when network has None config
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
Resolves #6525
2019-03-07 15:30:11 +01:00
087bef4f95
Add tests for compose file 'scale: 0'
...
Signed-off-by: Jonathan Cremin <jonathan@crem.in>
2019-03-06 12:57:14 +00:00
0b039202ac
docs/README.md: update since `vnext-compose` branch is no longer used.
...
All PRs should be made to `master` now. Also:
- Template seems to exist now[0] so remove the "coming soon".
- The labels used seem different now, but labelling seems more like a docs
maintainer thing than a contributor thing, so just drop that paragraph.
[0] https://raw.githubusercontent.com/docker/docker.github.io/master/.github/PULL_REQUEST_TEMPLATE.md
Signed-off-by: Ian Campbell <ijc@docker.com>
2019-03-06 10:37:32 +00:00
Ian Campbell
Nao YONASHIRO
Ulysses Souza
Inconnu08
noname
Djordje Lukic
Djordje Lukic
joeweoj
Collins Abitekaniza
Chris Crone
Ben Firshman
Henke Adolfsson
Michael Irwin
Jonathan Cremin
Ian Campbell