Ulysses Souza
0aa590649c
"Bump 1.24.0"
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 18:34:02 +01:00
Ulysses Souza
eb2fdf81b4
Bump docker-py 3.7.2
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 18:29:27 +01:00
Ulysses Souza
917c2701f2
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-28 18:29:25 +01:00
Djordje Lukic
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
Ulysses Souza
ac148bc1ca
Bump docker-py 3.7.2
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-28 17:45:03 +01:00
Ian Campbell
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
joeweoj
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
Ulysses Souza
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
Ian Campbell
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
Collins Abitekaniza
c6dd7da15e
only pull images that can't build
...
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
2019-03-24 01:05:30 +03:00
Ulysses Souza
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
Ulysses Souza
3a3288c54b
Merge pull request #6609 from docker/bump-1.24.0-rc3
...
Bump 1.24.0-rc3
2019-03-22 15:51:21 +01:00
Ulysses Souza
428942498b
"Bump 1.24.0-rc3"
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 15:15:52 +01:00
Ulysses Souza
c54341758a
Fix bintray docker-compose link
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 15:15:22 +01:00
Ulysses Souza
662761dbba
Fix typo on finalize
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 15:15:22 +01:00
Ulysses Souza
0e05ac6d2c
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 15:15:22 +01:00
Ulysses Souza
295dd9abda
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 15:15:21 +01:00
Ben Firshman
81b30c4380
Enable bootloader_ignore_signals in pyinstaller
...
Fixes #3347
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2019-03-22 15:15:19 +01:00
Michael Irwin
360753ecc1
Added test case to verify fix for #6525
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
2019-03-22 15:15:18 +01:00
Michael Irwin
3fae0119ca
Fix merging of compose files when network has None config
...
Signed-off-by: Michael Irwin <mikesir87@gmail.com>
Resolves #6525
2019-03-22 15:15:18 +01:00
Christopher Crone
0fdb9783cd
circleci: Fix virtualenv version to 16.2.0
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-03-22 15:15:17 +01:00
Ulysses Souza
0dec6b5ff1
Fix Flake8 lint
...
This removes extra indentation and replace the use of `is` by `==` when
comparing strings
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 15:15:16 +01:00
Christopher Crone
e0412a2488
Dockerfile: Force version of virtualenv to 16.2.0
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-03-22 15:15:16 +01:00
Christopher Crone
3fc5c6f563
script.build.linux: Do not tail image build logs
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-03-22 15:15:16 +01:00
Christopher Crone
28310b3ba4
requirements-dev: Fix version of mock to 2.0.0
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-03-22 15:15:16 +01:00
Christopher Crone
4585db124a
macOS: Bump Python and OpenSSL
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-03-22 15:15:16 +01:00
Ulysses Souza
1f9b20d97b
Add `--parallel` to `docker build`'s options in `bash` and `zsh` completion
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 15:15:13 +01:00
Djordje Lukic
82a89aef1c
Support for credential_spec
...
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-03-22 15:15:12 +01:00
Harald Albers
3934617e37
Add bash completion for `ps --all|-a`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2019-03-22 15:15:10 +01:00
Ulysses Souza
fc757fb4f5
Merge pull request #6604 from ulyssessouza/fix-release-resources
...
Fix release resources
2019-03-22 11:52:36 +01:00
Ulysses Souza
2948c396a6
Fix bintray docker-compose link
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
Ulysses Souza
15f8c30a51
Fix typo on finalize
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-03-22 11:23:44 +01:00
Ulysses Souza
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
Ulysses Souza
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
Ulysses Souza
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
Ulysses Souza
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
Chris Crone
3b846ac8de
Merge pull request #6578 from bfirsh/bootloader-ignore-signals
...
Enable bootloader_ignore_signals in pyinstaller
2019-03-15 11:48:33 +01:00
Ben Firshman
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
Ian Campbell
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
Ian Campbell
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
Henke Adolfsson
853215acf6
Remove project.stop() in test
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
Henke Adolfsson
87935893fc
Update data for unit tests
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
Henke Adolfsson
aa79fb2473
Ensure test passes
...
Signed-off-by: Henke Adolfsson <catears13@gmail.com>
2019-03-08 07:43:53 +01:00
Henke Adolfsson
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
Chris Crone
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
Ian Campbell
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
Michael Irwin
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
Michael Irwin
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
Jonathan Cremin
087bef4f95
Add tests for compose file 'scale: 0'
...
Signed-off-by: Jonathan Cremin <jonathan@crem.in>
2019-03-06 12:57:14 +00:00
Ian Campbell
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