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
40b0ce3e5d
Merge pull request #6542 from akshitgrover/6028-Add_Quiet_Builds
...
Add --quiet build flag
2019-03-05 14:55:32 +00:00
42c965935f
Fix scale attribute to accept 0 as a value
...
Signed-off-by: Jonathan Cremin <jonathan@crem.in>
2019-03-05 11:34:48 +00:00
615c01c50a
Merge pull request #6368 from xificurC/master
...
adds --no-interpolate to docker-compose config
2019-03-05 09:38:36 +00:00
e34d329227
adds --no-interpolate to docker-compose config
...
Signed-off-by: Peter Nagy <pnagy@gratex.com>
2019-03-04 13:03:35 +01:00
1f97a572fe
Add --quiet build flag
...
Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com>
2019-03-02 13:07:23 +05:30
b09d8802ed
Added additional argument (--env-file) for docker-compose to import environment variables from a given PATH.
...
Signed-off-by: Dimitrios Mavrommatis <jim.mavrommatis@gmail.com>
2019-02-26 16:38:54 +01:00
572032fc0b
Fix Project#build_container_operation_with_timeout_func not to mutate a 'option' dict over multiple containers
...
Signed-off-by: Yuichiro Tsuchiya <t.yic.yt@gmail.com>
2019-02-25 13:07:41 +01:00
133df63108
Add built Python smoke test to macOS setup script
...
Prior to this smoke test, the macOS setup step wouldn't fail if the
Python that it built wasn't functional. This will make debugging Python
build issues easier in the future.
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-21 16:21:09 +01:00
dbc229dc37
Fix macOS build for Python 3.7
...
- Specify --with-openssl directory for Python build
- Better checks for downloaded SDK, OpenSSL, and Python
- Fix missing slash for Python build CPPFLAGS
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-21 13:57:25 +01:00
bb0bd3b26b
Harmonize tox and virtualenv versions
...
- Set all tox versions to 2.9.1
- Set all virtualenv version to 16.2.0
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-02-21 13:56:45 +01:00
a734371e7f
Bump python version from 3.6.8 to 3.7.2
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-02-21 13:56:45 +01:00
768c788da9
Merge pull request #6504 from docker/mac-bump-openssl
...
Bump OpenSSL for macOS build
2019-02-21 11:50:24 +01:00
aee88e21bf
Merge pull request #6529 from ulyssessouza/rm-option
...
Add --no-rm to command build
2019-02-20 18:33:29 +01:00
a35aef4953
Add --no-rm to command build
...
- When present, build does not remove
intermediate containers after a successful build.
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-02-20 18:09:09 +01:00
fbbf78d3da
macOS: Bump OpenSSL to 1.1.1a
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-20 15:59:41 +01:00
a65b3cd758
Merge pull request #6503 from docker/mac-virtualenv-fix
...
Force virtualenv version for macOS CI
2019-02-20 15:59:13 +01:00
4813689c9e
Merge pull request #6514 from albers/completion-fix-build--memory
...
Fix bash completion for `build --memory`
2019-02-20 15:48:15 +01:00
436a343a18
Fix bash completion for `build --memory`
...
- the option requires an argument
- adds missing short form `-m`
Signed-off-by: Harald Albers <github@albersweb.de>
2019-02-11 13:50:41 +01:00
d9ffec4002
circleci: Fix virtualenv version to 16.2.0
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-05 12:13:19 +01:00
3cddd1b670
Merge pull request #6501 from chris-crone/build-fixes
...
Various build fixes
2019-02-05 11:41:29 +01:00
c8a621b637
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-02-05 11:11:52 +01:00
f472fd545b
Dockerfile: Force version of virtualenv to 16.2.0
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-05 10:51:33 +01:00
f1f0894c1b
script.build.linux: Do not tail image build logs
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
2019-02-05 10:50:55 +01:00
Ian Campbell
joeweoj
Ulysses Souza
Collins Abitekaniza
Chris Crone
Ben Firshman
Henke Adolfsson
Michael Irwin
Jonathan Cremin
Ian Campbell
Peter Nagy (NPE)
Akshit Grover
slowr
tuttieee
Harald Albers