tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 23:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,361 Commits 21 Branches 282 Tags
Commit Graph

5361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ian Campbell
40b0ce3e5d
Merge pull request #6542 from akshitgrover/6028-Add_Quiet_Builds 
Add --quiet build flag
 2019-03-05 14:55:32 +00:00
Jonathan Cremin
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
Ian Campbell
615c01c50a
Merge pull request #6368 from xificurC/master 
adds --no-interpolate to docker-compose config
 2019-03-05 09:38:36 +00:00
Peter Nagy (NPE)
e34d329227 adds --no-interpolate to docker-compose config 
Signed-off-by: Peter Nagy <pnagy@gratex.com>
 2019-03-04 13:03:35 +01:00
Akshit Grover
1f97a572fe
Add --quiet build flag 
Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com>
 2019-03-02 13:07:23 +05:30
slowr
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
tuttieee
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
Christopher Crone
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
Christopher Crone
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
Ulysses Souza
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