Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(dockerfiles) update Dockerfile - autoupdate/demisto/python3_sklearn_3.12.7.117934 #35106

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+12 −5
Open

build(dockerfiles) update Dockerfile - autoupdate/demisto/python3_sklearn_3.12.7.117934 #35106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebf3024
upgrade-pipenv
yaakovpraisler Jan 6, 2025
b73a1cb
which python
yaakovpraisler Jan 6, 2025
65d760f
handle base images without version
yaakovpraisler Jan 6, 2025
0e16934
fix internal flow
yaakovpraisler Jan 6, 2025
68fde54
Update Dockerfiles
Jan 6, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/update-external-base-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,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 ===="
[[ ${{ vars.DISABLE_TIMESTAMP_AUTOUPDATES }} = 'true' ]] && tu_flag="--no-timestamp-updates"
echo tu_flag being passed is $tu_flag
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-internal-base-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
2 changes: 1 addition & 1 deletion docker/sklearn/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM demisto/python3:3.11.10.116949
FROM demisto/python3:3.12.7.117934

COPY requirements.txt .

Expand Down
7 changes: 7 additions & 0 deletions utils/auto_dockerfile_update/get_dockerfiles.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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,
Expand Down