tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:50:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,278 Commits 24 Branches 268 Tags
Commit Graph

5278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ulysses Souza
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
Chris Crone
768c788da9
Merge pull request #6504 from docker/mac-bump-openssl 
Bump OpenSSL for macOS build
 2019-02-21 11:50:24 +01:00
Ulysses Souza
aee88e21bf
Merge pull request #6529 from ulyssessouza/rm-option 
Add --no-rm to command build
 2019-02-20 18:33:29 +01:00
Ulysses Souza
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
Christopher Crone
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
Chris Crone
a65b3cd758
Merge pull request #6503 from docker/mac-virtualenv-fix 
Force virtualenv version for macOS CI
 2019-02-20 15:59:13 +01:00
Chris Crone
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
Harald Albers
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
Christopher Crone
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
Chris Crone
3cddd1b670
Merge pull request #6501 from chris-crone/build-fixes 
Various build fixes
 2019-02-05 11:41:29 +01:00
Ulysses Souza
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
Christopher Crone
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
Christopher Crone
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
Christopher Crone
b572b32999 requirements-dev: Fix version of mock to 2.0.0 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-02-05 10:50:25 +01:00
Christopher Crone
8ad4c08109 macOS: Bump Python and OpenSSL 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2019-02-05 10:40:03 +01:00
Ulysses Souza
9de1f569f3
Merge pull request #6479 from ulyssessouza/shell-completion-parallel 
Add `--parallel` to `docker build`'s options in `bash` and `zsh` completion
 2019-01-24 15:10:06 +01:00
Ulysses Souza
698ea33b15 Add --parallel to docker build's options in bash and zsh completion 
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
 2019-01-21 19:13:45 +01:00
Ulysses Domiciano Souza
f158fb03e7
Merge pull request #6364 from ulyssessouza/6350-avoid-warning-on-exec 
Avoids misleading warning concerning env vars when perfoming an `exec` command
 2019-01-21 12:01:31 +01:00
Chris Crone
8f5f7e72be
Merge pull request #6466 from rumpl/credential-spec 
Support for credential_spec
 2019-01-21 11:03:34 +01:00
Chris Crone
718346f103
Merge pull request #6454 from rumpl/digest-distribution 
Resolve digests without pulling image
 2019-01-21 11:02:42 +01:00
Djordje Lukic
ae0f3c74a0 Support for credential_spec 
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-17 16:00:22 +01:00
Chris Crone
e40eaa5df6
Merge pull request #6461 from albers/completion-ps--all 
Add bash completion for `ps --all|-a`
 2019-01-16 22:08:35 +01:00
Djordje Lukic
0c20fc5d91 Resolve digests without pulling image 
If there is no image locally `docker-compose --resolve-image-digests`
will try and get the digest from the repository.

Fixes https://github.com/docker/compose/issues/5818

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2019-01-15 14:24:26 +01:00
Chris Crone
d5d49a8e29
Merge pull request #6460 from shin-/maintainers_update 
Update maintainers file
 2019-01-15 12:56:21 +01:00
Harald Albers
14a1a0c020 Add bash completion for ps --all|-a 
Signed-off-by: Harald Albers <github@albersweb.de>
 2019-01-15 09:01:49 +01:00
Joffrey F
6933435004 Update maintainers file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2019-01-14 15:22:12 -08:00
Joffrey F
cf96fcb4af
Merge pull request #6452 from docker/collin5-b6446 
Fix failure check in parallel_execute_watch
 2019-01-10 17:55:33 -08:00
Joffrey F
bcccac69fa
Merge pull request #6444 from qboot/master 
Upgrade pyyaml to 4.2b1
 2019-01-10 16:31:29 -08:00