update-dockerfile-update-workflow

.github/workflows/create-update-dockerfiles-PR.yml

@@ -2,10 +2,9 @@ name: Create update dockerfiles PR
 
 on:
   workflow_run:
-    workflows: [Update external base images, Update internal base images]
-    types: completed
-  workflow_dispatch:
-
+    workflows: [Update external base images test, Update internal base images test]
+    types:
+      - completed
 jobs:
   # ------------------------
   get_branches:
@@ -22,7 +21,7 @@ jobs:
           GITHUB_TOKEN: ${{secrets.CONTENT_BOT_TOKEN}}
         run: |
           git fetch
-          branches=$(git branch -r | grep autoupdate/)
+          branches=$(git branch -r | grep TEST18auTESTtoTESTupdate/)
           matrix="[ "
           for branch in $(echo $branches); do
             exists=`gh pr list --state open -H ${branch#origin/}`
@@ -55,13 +54,13 @@ jobs:
         destination_branch: ""                                                    # If blank, default: master
         pr_title: "build(dockerfiles) update Dockerfile - ${{ matrix.branches }}" # Title of pull request
         pr_body: "This is automated PR to update dockerfiles base images\n${{ matrix.branches }}"
-    - name: approve and merge
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        PR_URL: ${{ steps.open-pr.outputs.pr_url }}
-      if: ${{ steps.open-pr.outputs.pr_url }}
-      run: |
-        echo "Approving and merging"
-        gh pr review --approve "$PR_URL"
-        gh pr merge --auto --squash "$PR_URL" 
+    # - name: approve and merge
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    #     PR_URL: ${{ steps.open-pr.outputs.pr_url }}
+    #   if: ${{ steps.open-pr.outputs.pr_url }}
+    #   run: |
+    #     echo "Approving and merging"
+    #     gh pr review --approve "$PR_URL"
+    #     gh pr merge --auto --squash "$PR_URL" 
 

.github/workflows/update-external-base-images.yml

@@ -1,10 +1,13 @@
-name: Update external base images
+name: Update external base images test
 
 on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
+  push:
+    branches:
+      - update-dockerfile-update-workflow
+  # schedule:
+  #   - cron: '0 0 * * *'
+  # workflow_dispatch:
+
 
 jobs:
   update-docker-files:
@@ -17,14 +20,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
+      - name: Setup Poetry
+        uses: Gr1N/setup-poetry@v8
       - name: run
         run: |
             git config --global user.email ""
             git config --global user.name "auto dockerfiles update"
             echo "==== $(date): Starting pipenv setup... ===="
             python -m pip install --upgrade pip
-            pip install pipenv
+            pip install pipenv==2023.3.18
             pipenv install
             echo "==== Finished ===="
             [[ ${{ vars.DISABLE_TIMESTAMP_AUTOUPDATES }} = 'true' ]] && tu_flag="--no-timestamp-updates"

.github/workflows/update-internal-base-images.yml

@@ -1,9 +1,13 @@
-name: Update internal base images
+name: Update internal base images test
 
+# on:
+#   schedule:
+#     - cron: '30 0,4,8,12,16,20 * * *'
 on:
-  schedule:
-    - cron: '30 0,4,8,12,16,20 * * *'
-  workflow_dispatch:
+  push:
+    branches:
+      - update-dockerfile-update-workflow
+  # workflow_dispatch:
 
 jobs:
   update-docker-files:
@@ -15,14 +19,16 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.10'
+      - name: Setup Poetry
+        uses: Gr1N/setup-poetry@v8
       - name: run
         run: |
             git config --global user.email ""
             git config --global user.name "auto dockerfiles update"
             echo "==== $(date): Starting pipenv setup... ===="
             python -m pip install --upgrade pip
-            pip install pipenv
+            pip install pipenv==2023.3.18
             pipenv install
             echo "==== Finished ===="
             pipenv run python ./utils/auto_dockerfile_update/update_dockerfiles.py -t internal

Pipfile

@@ -16,4 +16,4 @@ gitpython = "*"
 pytest = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"

utils/auto_dockerfile_update/get_dockerfiles.py

@@ -3,16 +3,17 @@
 import re
 from datetime import datetime
 from pathlib import Path
-from typing import List, Dict
+from typing import List, Dict, Tuple, Optional
 from configparser import ConfigParser, MissingSectionHeaderError
 from dateutil.parser import parse
 
-
+EXTRACT_PYTHON_VERSION_REGEX = re.compile(r"3.\d{1,3}.\d{1,3}")
 BASE_IMAGE_REGEX = re.compile(r"(?:FROM [\S]+)")
 INTERNAL_BASE_IMAGES = re.compile(r"(demisto\/|devdemisto\/)")
 LAST_MODIFIED_REGEX = re.compile(r"# Last modified: [^\n]*")
 
 
+
 def get_last_modified(docker_file_content: str) -> str:
     """
     Get the last modified section in dockerfile, if not exists return 1.1.2000 12:00:00 +00:00
@@ -90,7 +91,31 @@ def filter_ignored_files(files_list):
         print(f'could not read ignored config {str(e)}')
         return files_list
 
-
+def get_file_path_and_docker_version_if_exist(dockerfile: dict, docker_latest_tag:str)-> Optional[Tuple]:
+        """Gets the Pipfile or the pyproject.toml file path 
+           and the docker version from the Dockerfile.
+        Args:
+            dockerfile (str): A dict that represents the docker file.
+            docker_latest_tag (str): latest tag string.
+        Returns:
+            Tuple[str,str]: The file path, The docker file tag.
+        """
+        base_path = dockerfile["path"]
+        base_path=base_path.replace("/Dockerfile", "")
+        pipfile_path = glob(f"{base_path}/Pipfile", recursive=True)
+        pyproject_path = glob(f"{base_path}/pyproject.toml", recursive=True)
+        extracted_python_version = re.search(EXTRACT_PYTHON_VERSION_REGEX, docker_latest_tag)
+        if extracted_python_version:
+            extracted_version = extracted_python_version.group(0)
+            if path := (pipfile_path or pyproject_path):
+                print(f"[INFO] Got path for: {path[0]}")
+                return path[0],extracted_version
+            else:
+                print(f"[INFO] Can't find Pipfile/pyproject file for {dockerfile['name']}.")
+        else:
+            print(f"[ERROR] Can't find docker tag for {dockerfile['name']}.")
+        return None
+
 def get_docker_files(base_path="docker/", devonly=False, external=False, internal=False) -> List[Dict]:
     """
     Get all the relevant dockerfiles from the repository.