From ebf3024b207efe2b93c9f7fcf43776031729d10c Mon Sep 17 00:00:00 2001 From: ypreisler Date: Mon, 6 Jan 2025 10:39:08 +0200 Subject: [PATCH 1/5] upgrade-pipenv --- .github/workflows/update-external-base-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-external-base-images.yml b/.github/workflows/update-external-base-images.yml index 1d5e951592e79..a4ef9bbad8dfd 100644 --- a/.github/workflows/update-external-base-images.yml +++ b/.github/workflows/update-external-base-images.yml @@ -25,7 +25,7 @@ jobs: git config --global user.name "auto dockerfiles update" echo "==== $(date): Starting pipenv setup... ====" python -m pip install --upgrade pip - pip install pipenv==2023.3.18 + pip install pipenv==2024.4.0 pipenv install echo "==== Finished ====" [[ ${{ vars.DISABLE_TIMESTAMP_AUTOUPDATES }} = 'true' ]] && tu_flag="--no-timestamp-updates" From b73a1cb86b477932e46bdc57dea3fe8036f64e2d Mon Sep 17 00:00:00 2001 From: ypreisler Date: Mon, 6 Jan 2025 11:05:22 +0200 Subject: [PATCH 2/5] which python --- .github/workflows/update-external-base-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-external-base-images.yml b/.github/workflows/update-external-base-images.yml index a4ef9bbad8dfd..51666a6aaee27 100644 --- a/.github/workflows/update-external-base-images.yml +++ b/.github/workflows/update-external-base-images.yml @@ -26,7 +26,7 @@ jobs: echo "==== $(date): Starting pipenv setup... ====" python -m pip install --upgrade pip pip install pipenv==2024.4.0 - pipenv install + pipenv install --python=$(which python) echo "==== Finished ====" [[ ${{ vars.DISABLE_TIMESTAMP_AUTOUPDATES }} = 'true' ]] && tu_flag="--no-timestamp-updates" echo tu_flag being passed is $tu_flag From 65d760f7185d8d57fb8828edc849c8f517d029bc Mon Sep 17 00:00:00 2001 From: ypreisler Date: Mon, 6 Jan 2025 11:26:27 +0200 Subject: [PATCH 3/5] handle base images without version --- utils/auto_dockerfile_update/get_dockerfiles.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/utils/auto_dockerfile_update/get_dockerfiles.py b/utils/auto_dockerfile_update/get_dockerfiles.py index bb9034548bfd0..a84ee8c14b5ff 100644 --- a/utils/auto_dockerfile_update/get_dockerfiles.py +++ b/utils/auto_dockerfile_update/get_dockerfiles.py @@ -48,6 +48,9 @@ def parse_base_image(full_base_image_name: str) -> (str, str, str): else: repository, full_image_name = full_base_image_name.split("/") + if not ":" in full_image_name: + return repository, full_image_name, None + image_name, tag = full_image_name.split(":") return repository, image_name, tag @@ -160,7 +163,11 @@ def get_docker_files(base_path="docker/", devonly=False, external=False, interna base_image = base_image.replace("FROM ", "") is_internal = re.search(INTERNAL_BASE_IMAGES, base_image) if (is_internal and internal) or (not is_internal and external): + repo, image_name, tag = parse_base_image(base_image) + if not tag: # base image doesn't have a version to update + continue + last_modified = get_last_modified(docker_file_content) curr_dockerfile = { "path": path, From 0e16934d9c3ff221122788b91eae5440119519d3 Mon Sep 17 00:00:00 2001 From: ypreisler Date: Mon, 6 Jan 2025 11:30:44 +0200 Subject: [PATCH 4/5] fix internal flow --- .github/workflows/update-internal-base-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-internal-base-images.yml b/.github/workflows/update-internal-base-images.yml index af091a7f31f74..4eec0f451c18c 100644 --- a/.github/workflows/update-internal-base-images.yml +++ b/.github/workflows/update-internal-base-images.yml @@ -24,8 +24,8 @@ jobs: git config --global user.name "auto dockerfiles update" echo "==== $(date): Starting pipenv setup... ====" python -m pip install --upgrade pip - pip install pipenv==2023.3.18 - pipenv install + pip install pipenv==2024.4.0 + pipenv install --python=$(which python) echo "==== Finished ====" pipenv run python ./utils/auto_dockerfile_update/update_dockerfiles.py -t internal echo "Done!" From 68fde5476664f202c4e9874b4edc1d0fd790ce50 Mon Sep 17 00:00:00 2001 From: auto dockerfiles update <> Date: Mon, 6 Jan 2025 09:32:47 +0000 Subject: [PATCH 5/5] Update Dockerfiles --- docker/sklearn/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/sklearn/Dockerfile b/docker/sklearn/Dockerfile index 8dc4f2b3162cf..b0bcb11695426 100644 --- a/docker/sklearn/Dockerfile +++ b/docker/sklearn/Dockerfile @@ -1,4 +1,4 @@ -FROM demisto/python3:3.11.10.116949 +FROM demisto/python3:3.12.7.117934 COPY requirements.txt .