440c94ea7a
Merge pull request #7328 from luHub/7242-fix-cli-no-labels
...
Bug fix 7242 docker-compose with buildkit does not insert container labels
2020-03-31 03:01:27 +02:00
1a688289b4
add labels to CLIbuilder
...
Signed-off-by: luHub <lucioguerchi16f@gmail.com>
2020-03-28 18:00:22 +01:00
0ace76114b
Add conformity tests hack
...
- That can be used with:
./script/test/acceptance
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-03-10 15:41:28 +01:00
d412a1e47f
Merge pull request #6937 from apollo13/issue6871
...
Properly escape values coming from env_files, fixes #6871
2020-02-24 11:52:14 +01:00
09c80ce49b
test update - remove 'placement' from unsupported fields
...
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-02-07 13:50:06 +01:00
2dfd85e30e
Use docker context interface from docker-py
...
Signed-off-by: Anca Iordache <anca.iordache@docker.com>
2020-02-06 12:01:37 +01:00
9f5f8b4757
Remove `None` entries on execute command
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-01-30 19:26:33 +01:00
f17e7268b0
Properly escape values coming from env_files, fixes #6871
...
Signed-off-by: Florian Apolloner <florian@apolloner.eu>
2020-01-28 16:33:28 +01:00
409a9d8207
Merge pull request #7150 from ulyssessouza/add-python-dotenv
...
Add python-dotenv to delegate `.env` file processing
2020-01-27 14:48:41 +01:00
6d2658ea65
Add python-dotenv
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-01-27 13:50:34 +01:00
a6b602d086
Support attaching to dependencies on up
...
When using the 'up' command, only services listed as arguments are
attached to, which can be very different to the 'no argument' case
if a service has many and deep dependencies:
- It's not clear when dependencies have failed to start. Have to run
'compose ps' separately to find out.
- It's not clear when dependencies are erroring. Have to run 'compose
logs' separately to find out.
With a simple setup, it's possible to work around theses issue by
using the 'up' command without arguments. But when there are lots of
'top-level' services, with common dependencies, in a single config,
using 'up' without arguments isn't practical due to resource limits
and the sheer volume of output from other services.
This introduces a new '--attach-dependencies' flag to optionally attach
dependent containers as part of the 'up' command. This makes their logs
visible in the output, alongside the listed services. It also means we
benefit from the '--abort-on-container-exit' behaviour when dependencies
fail to start, giving more visibility of the failure.
Signed-off-by: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
2020-01-16 13:41:54 +00:00
093cc2c089
Allow setting compatibility options from environment
...
Signed-off-by: Kevin Roy <kiniou@gmail.com>
2020-01-13 14:53:03 +01:00
2cb1b4bd5b
Merge pull request #6873 from frenzymadness/pytest_compatibility
...
Bump Pytest and add refactor compatibility with new version
2020-01-10 17:09:33 +01:00
a436fb953c
Remove indentation from test YAML
...
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
2020-01-10 08:41:11 +01:00
c818bfc62c
support PyYAML up to 5.x version
...
Signed-off-by: Sergey Fursov <geyser85@gmail.com>
2020-01-09 12:30:51 +01:00
73cc89c15f
Use stdlib modules instead of deprecated pytest fixtures
...
Signed-off-by: Lumír Balhar <lbalhar@redhat.com>
2020-01-09 07:01:44 +01:00
60458c8ae7
Implement custom context manager for changing CWD
...
Signed-off-by: Lumír Balhar <lbalhar@redhat.com>
2020-01-09 06:55:28 +01:00
33eeef41ab
Remove "bundle" subcommand and support for DAB files
...
Deploying stacks using the "Docker Application Bundle" (`.dab`) file
format was introduced as an experimental feature in Docker 1.13 /
17.03, but superseded by support for Docker Compose files in the CLI.
With no development being done on this feature, and no active use of the file
format, support for the DAB file format and the top-level `docker deploy` command
(hidden by default in 19.03), will be removed from the CLI, in favour of
`docker stack deploy` using compose files.
This patch removes the `docker-compose bundle` subcommand from Docker Compose,
which was used to convert compose files into DAB files (and given the above,
will no longer be needed).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-08 16:42:49 +01:00
702dd9406c
Merge pull request #7093 from ulyssessouza/warn-invalid-version
...
Validate version format on formats 2+
2020-01-08 10:47:01 +01:00
7f49bbb998
Validate version format on formats 2+
...
Signed-off-by: ulyssessouza <ulyssessouza@gmail.com>
2020-01-07 18:37:47 +01:00
37eb7a509b
Decode APIError explanation to unicode before usage
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-01-06 16:00:34 +01:00
cba8ad474c
Fix by adding an assert to make the comparison effective
...
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-01-06 15:53:32 +01:00
55c5c8e8ac
Report image we can't pull and must be built
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2019-11-25 15:18:27 +01:00
a83d86e7ce
Merge pull request #7037 from ndeloof/stdin
...
config_detail.filename is None when passed by stdin
2019-11-22 15:24:43 +01:00
e6ec77047b
Revert "only pull images that can't build"
...
This reverts commit c6dd7da15e
2019-11-21 14:37:41 +01:00
fe2b692547
testcase for compose file read from stdin
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2019-11-20 15:38:15 +01:00
f8142a899c
Cleanup all open files
...
If the fd is not closed the cleanup will fail on windows.
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2019-10-28 15:36:05 +01:00
386bdda246
Format image size as decimal to be align with Docker CLI
...
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
2019-10-18 12:50:38 +02:00
1ca10f90fb
Fix acceptance tests
...
tty is now (correclty) reported to have 80 columns, which split service
ID in two lines
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2019-10-16 14:31:27 +02:00
74f892de95
Add test to verify same file 'extends' optimization
...
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
2019-10-09 11:36:17 +06:00
eca358e2f0
Fix secret missing warning
...
Signed-off-by: ulyssessouza <ulyssessouza@gmail.com>
2019-09-27 09:10:49 +02:00
70ead597d2
Add tests to 'get_secret' warnings
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-09-09 10:04:05 +02:00
1566930a70
Merge pull request #6862 from deathtracktor/master
...
Fix KeyError when remote network labels are None.
2019-09-06 11:13:48 +02:00
a5fbf91b72
Prevent KeyError when remote network labels are None.
...
Signed-off-by: Danil Kister <danil.kister@gmail.com>
2019-09-05 21:36:10 +02:00
47d170b06a
Fix race condition on watch_events
...
Avoid to attach to restarting containers and ignore
race conditions when trying to attach to already
dead containers
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-09-04 17:55:05 +02:00
5add9192ac
Rename envvar switch to COMPOSE_DOCKER_CLI_BUILD
...
From `COMPOSE_NATIVE_BUILDER` to `COMPOSE_DOCKER_CLI_BUILD`
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-08-30 12:11:09 +02:00
bbdb3cab88
Add integration tests to native builder
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-08-29 09:31:16 +02:00
60dcf87cc0
update alpine version to 3.10.1
...
Signed-off-by: aiordache <anca.iordache@docker.com>
2019-08-20 12:10:26 +02:00
b03889ac2a
Add integration tests regarding environment
...
This covers what was included in #6800
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-31 02:09:41 +02:00
cd8e2f870f
Merge pull request #6813 from ulyssessouza/fix_stdin_open
...
Fix stdin_open when running docker-compose run
2019-07-24 11:20:20 +02:00
c641ea08ae
Fix stdin_open when running docker-compose run
...
This fix makes sure that stdin_open specified in the service
is considering when shelling out to the CLI
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-22 17:27:10 +02:00
cd098e0cad
Pin test images on a non rolling tag
...
Mainly busybox:latest to the current latest which is 1.31.0-uclibc
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-18 11:10:37 +02:00
c8279bc4db
Merge pull request #6738 from Inconnu08/set-optimization
...
Replace sets with set literal syntax for efficiency
2019-07-15 15:23:24 +02:00
98932e9cb4
Merge pull request #6754 from Goryudyuma/6740-fix-display
...
fix: The correct number is displayed
2019-07-15 10:30:59 +02:00
59491c7d77
add: test for units
...
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
2019-07-14 04:31:16 +09:00
75d41edb94
fix: Add test
...
Signed-off-by: Kei Matsumoto <umaretekyoumade@gmail.com>
2019-07-14 03:38:29 +09:00
1b326fce57
Merge pull request #6720 from ijc/pass-env-to-docker-cli
...
Pass environment when calling through to docker cli.
2019-07-12 10:11:47 +02:00
cacc9752a3
Pin busybox image version in tests
...
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
2019-07-02 13:42:41 +02:00
57055e0e66
Replace sets with set literal syntax for efficiency
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-06-02 20:21:21 +06:00
c37fb783fe
replace sets with set literal syntax for efficiency
...
Signed-off-by: Taufiq Rahman <taufiqrx8@gmail.com>
2019-06-01 01:31:35 +06:00
Ulysses Souza
luHub
Ulysses Souza
Anca Iordache
Florian Apolloner
Ben Thorner
Kevin Roy
Lumir Balhar
Sergey Fursov
Sebastiaan van Stijn
Nicolas De Loof
Djordje Lukic
Guillaume Lours
Aleksandr Mezin
Silvin Lubecki
Danil Kister
Goryudyuma
Inconnu08