tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 05:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,581 Commits 20 Branches 280 Tags
Commit Graph

5581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulysses Souza
f2dc923084 Avoid race condition on test 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-19 15:53:02 +02:00
Ulysses Souza
8a89d94e15
Merge pull request #6641 from ulyssessouza/dockerfiles_refactor 
Refactor Dockerfiles for generating musl binaries
 2019-04-19 11:46:41 +02:00
Ulysses Souza
e047169315 Workaround race conditions on tests 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-17 17:59:12 +02:00
Ulysses Souza
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
Ulysses Souza
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
Ulysses Souza
5265f63c34
Merge pull request #6632 from ulyssessouza/update-releasedocs 
Update release process on updating docs
 2019-04-04 15:05:49 +02:00
Ulysses Souza
9e3d9f6681 Update release process on updating docs 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-04-04 11:51:12 +02:00
Ulysses Souza
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
Djordje Lukic
ef10c1803f "Bump 1.24.0" 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-03-28 19:38:25 +01:00
Ulysses Souza
d9fa8158c3
Merge pull request #6616 from docker/bump-1.24.0 
Bump 1.24.0
1.24.0 		2019-03-28 18:58:40 +01:00
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
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