Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions runo
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ from typing import (
Union,
)

__version__ = "25.09.16-5517b2d8"
__version__ = "25.10.10-e879d7bf"

# runo uses .toml format of config files, but parsers for this format
# might be not available in old python versions (only in 3.11 tomllib
Expand Down Expand Up @@ -349,11 +349,6 @@ class Composition:
def prepare(self):
option_to_value = _option_to_value(self._compose_options_from_config)

progress_option = _get_value_from_options(option_to_value, {"--progress"})
if not progress_option:
# We do want to be quite by default.
self._generated_options.extend(["--progress", "quiet"])

# We must support overriding of file name, at least because docker compose
# has multiple files support and users may want to use something like:
# docker compose -f docker-compose.yml -f docker-compose.override.yml run ...
Expand All @@ -369,7 +364,7 @@ class Composition:
[self.compose_base]
+ self._generated_options
+ self._compose_options_from_config
+ ["run"]
+ ["run --build"]
+ docker_run_options
+ [self._cfg["docker_compose_service"]]
+ [command_to_run]
Expand Down
4 changes: 1 addition & 3 deletions tests/unit/test_runo.py
Original file line number Diff line number Diff line change
Expand Up @@ -1232,10 +1232,8 @@ def expected_calls(self, command: dict, run_options: List[str], env_specific_dat
[
"docker",
"compose",
"--progress",
"quiet",
*expected_docker_compose_options,
"run",
"run --build",
]
+ _expected_docker_run_options(docker_run_options_str)
+ [container_config["docker_compose_service"]]
Expand Down