Skip to content

Commit e88f4d7

Browse files
mmhwkobymeir
andauthored
[docker] Increase container timeout (#4835)
* [docker] Increase container timeout * Add changelog * Update demisto_sdk/commands/common/docker_helper.py Co-authored-by: Koby Meir <[email protected]> * fix --------- Co-authored-by: Koby Meir <[email protected]>
1 parent 16fe31e commit e88f4d7

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.changelog/4835.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
changes:
2+
- description: Increase Docker container timeout when creating a new Docker image.
3+
type: feature
4+
pr_number: 4835

demisto_sdk/commands/common/docker_helper.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
)
5050

5151
TEST_REQUIREMENTS_DIR = Path(__file__).parent.parent / "lint" / "resources"
52+
DOCKER_CONTAINER_TIMEOUT = int(os.getenv("DOCKER_CONTAINER_TIMEOUT") or 300)
5253

5354

5455
class DockerException(Exception):
@@ -100,7 +101,7 @@ def init_global_docker_client(timeout: int = 60, log_prompt: str = ""):
100101
logger.debug(
101102
"Gitlab CI use case detected, trying to create docker client from Gitlab CI job environment."
102103
)
103-
DOCKER_CLIENT = docker.from_env()
104+
DOCKER_CLIENT = docker.from_env(timeout=timeout)
104105
if DOCKER_CLIENT.ping():
105106
# see https://docker-py.readthedocs.io/en/stable/client.html#docker.client.DockerClient.ping for more information about ping().
106107
logger.debug(
@@ -355,7 +356,7 @@ def create_container(
355356
"""
356357
Creates a container and pushing requested files to the container.
357358
"""
358-
docker_client = init_global_docker_client()
359+
docker_client = init_global_docker_client(timeout=DOCKER_CONTAINER_TIMEOUT)
359360

360361
try:
361362
container: docker.models.containers.Container = (

0 commit comments

Comments
 (0)