From 378e3581f31dfcc6dfa4661d07643ea07b2406bb Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 10 Jan 2025 11:19:12 +0100
Subject: [PATCH 01/24] Pin pnpm action to hash commit following best GH Action
 practices (#45547)

This was found by the CodeQL Actions scanning
---
 .github/workflows/basic-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 353f65d9a6c9c..da803aee31904 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -98,7 +98,7 @@ jobs:
       - name: "Cleanup docker"
         run: ./scripts/ci/cleanup_docker.sh
       - name: Setup pnpm
-        uses: pnpm/action-setup@v4.0.0
+        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2  # v4.0.0
         with:
           version: 9
           run_install: false

From a149dd72b31cf428e3a87b2ab3e3197cadd9a014 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 10 Jan 2025 11:19:30 +0100
Subject: [PATCH 02/24] CodeQL scanning can run always on all code (#45541)

The CodeQL scannig is fast and having custom configuration to
select which scanning to run should be run makes it unnecessarily
complex

We can just run all CodeQL scans always.

This has been suggested by actions codeql scan itself.
---
 .github/workflows/codeql-analysis.yml | 57 ---------------------------
 1 file changed, 57 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index be0d690799550..1fcf81a84fd5b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,46 +33,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  selective-checks:
-    name: Selective checks
-    runs-on: ["ubuntu-22.04"]
-    env:
-      GITHUB_CONTEXT: ${{ toJson(github) }}
-    outputs:
-      needs-python-scans: ${{ steps.selective-checks.outputs.needs-python-scans }}
-      needs-javascript-scans: ${{ steps.selective-checks.outputs.needs-javascript-scans }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-          persist-credentials: false
-      - name: "Install Breeze"
-        uses: ./.github/actions/breeze
-        with:
-          use-uv: "true"
-      - name: "Get information about the Workflow"
-        id: source-run-info
-        run: breeze ci get-workflow-info 2>> ${GITHUB_OUTPUT}
-        env:
-          SKIP_BREEZE_SELF_UPGRADE_CHECK: "true"
-      - name: Selective checks
-        id: selective-checks
-        env:
-          PR_LABELS: "${{ steps.source-run-info.outputs.pr-labels }}"
-          COMMIT_REF: "${{ github.sha }}"
-          VERBOSE: "false"
-        run: breeze ci selective-check 2>> ${GITHUB_OUTPUT}
-
   analyze:
     name: Analyze
     runs-on: ["ubuntu-22.04"]
-    needs: [selective-checks]
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
         language: ['python', 'javascript', 'actions']
     permissions:
       actions: read
@@ -84,37 +50,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           persist-credentials: false
-        if: |
-          matrix.language == 'actions' ||
-          matrix.language == 'python' && needs.selective-checks.outputs.needs-python-scans == 'true' ||
-          matrix.language == 'javascript' && needs.selective-checks.outputs.needs-javascript-scans == 'true'
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        if: |
-          matrix.language == 'actions' ||
-          matrix.language == 'python' && needs.selective-checks.outputs.needs-python-scans == 'true' ||
-          matrix.language == 'javascript' && needs.selective-checks.outputs.needs-javascript-scans == 'true'
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@v3
-        if: |
-          matrix.language == 'actions' ||
-          matrix.language == 'python' && needs.selective-checks.outputs.needs-python-scans == 'true' ||
-          matrix.language == 'javascript' && needs.selective-checks.outputs.needs-javascript-scans == 'true'
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
-        if: |
-          matrix.language == 'actions' ||
-          matrix.language == 'python' && needs.selective-checks.outputs.needs-python-scans == 'true' ||
-          matrix.language == 'javascript' && needs.selective-checks.outputs.needs-javascript-scans == 'true'

From 52f89dd5bc471b1702e7e5e67b90420e27d51d20 Mon Sep 17 00:00:00 2001
From: Pierre Jeambrun <pierrejbrun@gmail.com>
Date: Fri, 10 Jan 2025 18:48:22 +0800
Subject: [PATCH 03/24] AIP-84 Clear Task Instance improve response (#45514)

---
 .../core_api/datamodels/task_instances.py     | 15 -------
 .../core_api/openapi/v1-generated.yaml        | 36 +---------------
 .../core_api/routes/public/task_instances.py  |  9 ++--
 airflow/ui/openapi-gen/queries/queries.ts     |  2 +-
 .../ui/openapi-gen/requests/schemas.gen.ts    | 41 -------------------
 .../ui/openapi-gen/requests/services.gen.ts   |  2 +-
 airflow/ui/openapi-gen/requests/types.gen.ts  | 21 +---------
 .../routes/public/test_task_instances.py      | 41 ++++++++++++++++---
 8 files changed, 45 insertions(+), 122 deletions(-)

diff --git a/airflow/api_fastapi/core_api/datamodels/task_instances.py b/airflow/api_fastapi/core_api/datamodels/task_instances.py
index 07a1f77ad5421..3d191b96828a8 100644
--- a/airflow/api_fastapi/core_api/datamodels/task_instances.py
+++ b/airflow/api_fastapi/core_api/datamodels/task_instances.py
@@ -220,18 +220,3 @@ def validate_new_state(cls, ns: str | None) -> str:
         if ns not in valid_states:
             raise ValueError(f"'{ns}' is not one of {valid_states}")
         return ns
-
-
-class TaskInstanceReferenceResponse(BaseModel):
-    """Task Instance Reference serializer for responses."""
-
-    task_id: str
-    dag_run_id: str = Field(validation_alias="run_id")
-    dag_id: str
-
-
-class TaskInstanceReferenceCollectionResponse(BaseModel):
-    """Task Instance Reference collection serializer for responses."""
-
-    task_instances: list[TaskInstanceReferenceResponse]
-    total_entries: int
diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
index bb4861a5fc3c7..5d06e7ab28e1d 100644
--- a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
+++ b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -5506,7 +5506,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/TaskInstanceReferenceCollectionResponse'
+                $ref: '#/components/schemas/TaskInstanceCollectionResponse'
         '401':
           content:
             application/json:
@@ -9063,40 +9063,6 @@ components:
       - executor_config
       title: TaskInstanceHistoryResponse
       description: TaskInstanceHistory serializer for responses.
-    TaskInstanceReferenceCollectionResponse:
-      properties:
-        task_instances:
-          items:
-            $ref: '#/components/schemas/TaskInstanceReferenceResponse'
-          type: array
-          title: Task Instances
-        total_entries:
-          type: integer
-          title: Total Entries
-      type: object
-      required:
-      - task_instances
-      - total_entries
-      title: TaskInstanceReferenceCollectionResponse
-      description: Task Instance Reference collection serializer for responses.
-    TaskInstanceReferenceResponse:
-      properties:
-        task_id:
-          type: string
-          title: Task Id
-        dag_run_id:
-          type: string
-          title: Dag Run Id
-        dag_id:
-          type: string
-          title: Dag Id
-      type: object
-      required:
-      - task_id
-      - dag_run_id
-      - dag_id
-      title: TaskInstanceReferenceResponse
-      description: Task Instance Reference serializer for responses.
     TaskInstanceResponse:
       properties:
         id:
diff --git a/airflow/api_fastapi/core_api/routes/public/task_instances.py b/airflow/api_fastapi/core_api/routes/public/task_instances.py
index 9eaf191374746..91e4cb0ddcc2a 100644
--- a/airflow/api_fastapi/core_api/routes/public/task_instances.py
+++ b/airflow/api_fastapi/core_api/routes/public/task_instances.py
@@ -55,8 +55,6 @@
     TaskInstanceCollectionResponse,
     TaskInstanceHistoryCollectionResponse,
     TaskInstanceHistoryResponse,
-    TaskInstanceReferenceCollectionResponse,
-    TaskInstanceReferenceResponse,
     TaskInstanceResponse,
     TaskInstancesBatchBody,
 )
@@ -550,7 +548,7 @@ def post_clear_task_instances(
     request: Request,
     body: ClearTaskInstancesBody,
     session: SessionDep,
-) -> TaskInstanceReferenceCollectionResponse:
+) -> TaskInstanceCollectionResponse:
     """Clear task instances."""
     dag = request.app.state.dag_bag.get_dag(dag_id)
     if not dag:
@@ -597,6 +595,7 @@ def post_clear_task_instances(
         dry_run=True,
         task_ids=task_ids,
         dag_bag=request.app.state.dag_bag,
+        session=session,
         **body.model_dump(
             include={
                 "start_date",
@@ -615,9 +614,9 @@ def post_clear_task_instances(
             DagRunState.QUEUED if reset_dag_runs else False,
         )
 
-    return TaskInstanceReferenceCollectionResponse(
+    return TaskInstanceCollectionResponse(
         task_instances=[
-            TaskInstanceReferenceResponse.model_validate(
+            TaskInstanceResponse.model_validate(
                 ti,
                 from_attributes=True,
             )
diff --git a/airflow/ui/openapi-gen/queries/queries.ts b/airflow/ui/openapi-gen/queries/queries.ts
index e5d6d08240f02..9a816460704d5 100644
--- a/airflow/ui/openapi-gen/queries/queries.ts
+++ b/airflow/ui/openapi-gen/queries/queries.ts
@@ -2980,7 +2980,7 @@ export const useTaskInstanceServiceGetTaskInstancesBatch = <
  * @param data The data for the request.
  * @param data.dagId
  * @param data.requestBody
- * @returns TaskInstanceReferenceCollectionResponse Successful Response
+ * @returns TaskInstanceCollectionResponse Successful Response
  * @throws ApiError
  */
 export const useTaskInstanceServicePostClearTaskInstances = <
diff --git a/airflow/ui/openapi-gen/requests/schemas.gen.ts b/airflow/ui/openapi-gen/requests/schemas.gen.ts
index 9d59d4fd59a61..64a8fcc9e812c 100644
--- a/airflow/ui/openapi-gen/requests/schemas.gen.ts
+++ b/airflow/ui/openapi-gen/requests/schemas.gen.ts
@@ -4303,47 +4303,6 @@ export const $TaskInstanceHistoryResponse = {
   description: "TaskInstanceHistory serializer for responses.",
 } as const;
 
-export const $TaskInstanceReferenceCollectionResponse = {
-  properties: {
-    task_instances: {
-      items: {
-        $ref: "#/components/schemas/TaskInstanceReferenceResponse",
-      },
-      type: "array",
-      title: "Task Instances",
-    },
-    total_entries: {
-      type: "integer",
-      title: "Total Entries",
-    },
-  },
-  type: "object",
-  required: ["task_instances", "total_entries"],
-  title: "TaskInstanceReferenceCollectionResponse",
-  description: "Task Instance Reference collection serializer for responses.",
-} as const;
-
-export const $TaskInstanceReferenceResponse = {
-  properties: {
-    task_id: {
-      type: "string",
-      title: "Task Id",
-    },
-    dag_run_id: {
-      type: "string",
-      title: "Dag Run Id",
-    },
-    dag_id: {
-      type: "string",
-      title: "Dag Id",
-    },
-  },
-  type: "object",
-  required: ["task_id", "dag_run_id", "dag_id"],
-  title: "TaskInstanceReferenceResponse",
-  description: "Task Instance Reference serializer for responses.",
-} as const;
-
 export const $TaskInstanceResponse = {
   properties: {
     id: {
diff --git a/airflow/ui/openapi-gen/requests/services.gen.ts b/airflow/ui/openapi-gen/requests/services.gen.ts
index ee8b5ab70c202..01666ae090423 100644
--- a/airflow/ui/openapi-gen/requests/services.gen.ts
+++ b/airflow/ui/openapi-gen/requests/services.gen.ts
@@ -2394,7 +2394,7 @@ export class TaskInstanceService {
    * @param data The data for the request.
    * @param data.dagId
    * @param data.requestBody
-   * @returns TaskInstanceReferenceCollectionResponse Successful Response
+   * @returns TaskInstanceCollectionResponse Successful Response
    * @throws ApiError
    */
   public static postClearTaskInstances(
diff --git a/airflow/ui/openapi-gen/requests/types.gen.ts b/airflow/ui/openapi-gen/requests/types.gen.ts
index f9dad9f4edad5..232e66d246446 100644
--- a/airflow/ui/openapi-gen/requests/types.gen.ts
+++ b/airflow/ui/openapi-gen/requests/types.gen.ts
@@ -1050,23 +1050,6 @@ export type TaskInstanceHistoryResponse = {
   executor_config: string;
 };
 
-/**
- * Task Instance Reference collection serializer for responses.
- */
-export type TaskInstanceReferenceCollectionResponse = {
-  task_instances: Array<TaskInstanceReferenceResponse>;
-  total_entries: number;
-};
-
-/**
- * Task Instance Reference serializer for responses.
- */
-export type TaskInstanceReferenceResponse = {
-  task_id: string;
-  dag_run_id: string;
-  dag_id: string;
-};
-
 /**
  * TaskInstance serializer for responses.
  */
@@ -1984,7 +1967,7 @@ export type PostClearTaskInstancesData = {
   requestBody: ClearTaskInstancesBody;
 };
 
-export type PostClearTaskInstancesResponse = TaskInstanceReferenceCollectionResponse;
+export type PostClearTaskInstancesResponse = TaskInstanceCollectionResponse;
 
 export type GetLogData = {
   accept?: "application/json" | "text/plain" | "*/*";
@@ -4021,7 +4004,7 @@ export type $OpenApiTs = {
         /**
          * Successful Response
          */
-        200: TaskInstanceReferenceCollectionResponse;
+        200: TaskInstanceCollectionResponse;
         /**
          * Unauthorized
          */
diff --git a/tests/api_fastapi/core_api/routes/public/test_task_instances.py b/tests/api_fastapi/core_api/routes/public/test_task_instances.py
index d62d37944348c..eb07ae8bab6f5 100644
--- a/tests/api_fastapi/core_api/routes/public/test_task_instances.py
+++ b/tests/api_fastapi/core_api/routes/public/test_task_instances.py
@@ -1878,7 +1878,7 @@ def test_clear_taskinstance_is_called_with_queued_dr_state(self, mock_clearti, t
         )
         assert response.status_code == 200
 
-        # dag_id (3rd argument) is a different session object. Manually asserting that the dag_id
+        # dag (3rd argument) is a different session object. Manually asserting that the dag_id
         # is the same.
         mock_clearti.assert_called_once_with([], mock.ANY, mock.ANY, DagRunState.QUEUED)
         assert mock_clearti.call_args[0][2].dag_id == dag_id
@@ -1982,7 +1982,9 @@ def test_should_respond_200_with_reset_dag_run(self, test_client, session):
             },
         ]
         for task_instance in expected_response:
-            assert task_instance in response.json()["task_instances"]
+            assert task_instance in [
+                {key: ti[key] for key in task_instance.keys()} for ti in response.json()["task_instances"]
+            ]
         assert response.json()["total_entries"] == 6
         assert failed_dag_runs == 0
 
@@ -2037,6 +2039,32 @@ def test_should_respond_200_with_dag_run_id(self, test_client, session):
                 "dag_id": "example_python_operator",
                 "dag_run_id": "TEST_DAG_RUN_ID_0",
                 "task_id": "print_the_context",
+                "duration": mock.ANY,
+                "end_date": mock.ANY,
+                "executor": None,
+                "executor_config": "{}",
+                "hostname": "",
+                "id": mock.ANY,
+                "logical_date": "2020-01-01T00:00:00Z",
+                "map_index": -1,
+                "max_tries": 0,
+                "note": "placeholder-note",
+                "operator": "PythonOperator",
+                "pid": 100,
+                "pool": "default_pool",
+                "pool_slots": 1,
+                "priority_weight": 9,
+                "queue": "default_queue",
+                "queued_when": None,
+                "rendered_fields": {},
+                "rendered_map_index": None,
+                "start_date": "2020-01-02T00:00:00Z",
+                "state": "restarting",
+                "task_display_name": "print_the_context",
+                "trigger": None,
+                "triggerer_job": None,
+                "try_number": 0,
+                "unixname": mock.ANY,
             },
         ]
         assert response.json()["task_instances"] == expected_response
@@ -2121,7 +2149,9 @@ def test_should_respond_200_with_include_past(self, test_client, session):
             },
         ]
         for task_instance in expected_response:
-            assert task_instance in response.json()["task_instances"]
+            assert task_instance in [
+                {key: ti[key] for key in task_instance.keys()} for ti in response.json()["task_instances"]
+            ]
         assert response.json()["total_entries"] == 6
 
     def test_should_respond_200_with_include_future(self, test_client, session):
@@ -2204,7 +2234,9 @@ def test_should_respond_200_with_include_future(self, test_client, session):
             },
         ]
         for task_instance in expected_response:
-            assert task_instance in response.json()["task_instances"]
+            assert task_instance in [
+                {key: ti[key] for key in task_instance.keys()} for ti in response.json()["task_instances"]
+            ]
         assert response.json()["total_entries"] == 6
 
     def test_should_respond_404_for_nonexistent_dagrun_id(self, test_client, session):
@@ -2339,7 +2371,6 @@ def test_should_respond_200(self, test_client, session):
         self.create_task_instances(
             session=session, task_instances=[{"state": State.SUCCESS}], with_ti_history=True
         )
-        print("here")
         response = test_client.get(
             "/public/dags/example_python_operator/dagRuns/TEST_DAG_RUN_ID/taskInstances/print_the_context/tries"
         )

From c86d120369c43b67c6e78b56474df7e80ff722b5 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 10 Jan 2025 12:41:53 +0100
Subject: [PATCH 04/24] Add explicit permissions for all workflow-run workflows
 (#45548)

Those workflows inherit permissions from the calling workflows
but it's good to add explicit permissions to indicate what is
needed and in case we will also use the workflows for other purposes
in the future - default permissions for older repos might be
write so it's best to be explicit about the permissions.

Found by CodeQL scanning
---
 .github/workflows/additional-ci-image-checks.yml  | 2 ++
 .github/workflows/additional-prod-image-tests.yml | 2 ++
 .github/workflows/automatic-backport.yml          | 3 ++-
 .github/workflows/backport-cli.yml                | 3 +++
 .github/workflows/basic-tests.yml                 | 2 ++
 .github/workflows/ci-image-build.yml              | 2 ++
 .github/workflows/ci-image-checks.yml             | 3 ++-
 .github/workflows/finalize-tests.yml              | 2 ++
 .github/workflows/generate-constraints.yml        | 6 ++++++
 .github/workflows/helm-tests.yml                  | 2 ++
 .github/workflows/integration-system-tests.yml    | 2 ++
 .github/workflows/k8s-tests.yml                   | 2 ++
 .github/workflows/news-fragment.yml               | 3 ++-
 .github/workflows/prod-image-build.yml            | 3 ++-
 .github/workflows/prod-image-extra-checks.yml     | 2 ++
 .github/workflows/push-image-cache.yml            | 2 ++
 .github/workflows/run-unit-tests.yml              | 2 ++
 .github/workflows/special-tests.yml               | 3 ++-
 .github/workflows/task-sdk-tests.yml              | 3 ++-
 .github/workflows/test-provider-packages.yml      | 2 ++
 20 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/additional-ci-image-checks.yml b/.github/workflows/additional-ci-image-checks.yml
index 56cee1697620c..a6b7bdafcb5af 100644
--- a/.github/workflows/additional-ci-image-checks.yml
+++ b/.github/workflows/additional-ci-image-checks.yml
@@ -84,6 +84,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv to build the image (true/false)"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   # Push early BuildX cache to GitHub Registry in Apache repository, This cache does not wait for all the
   # tests to complete - it is run very early in the build process for "main" merges in order to refresh
diff --git a/.github/workflows/additional-prod-image-tests.yml b/.github/workflows/additional-prod-image-tests.yml
index bca5e3a592713..7b55121571471 100644
--- a/.github/workflows/additional-prod-image-tests.yml
+++ b/.github/workflows/additional-prod-image-tests.yml
@@ -60,6 +60,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   prod-image-extra-checks-main:
     name: PROD image extra checks (main)
diff --git a/.github/workflows/automatic-backport.yml b/.github/workflows/automatic-backport.yml
index b5b22b7491a9c..4c72401a5d317 100644
--- a/.github/workflows/automatic-backport.yml
+++ b/.github/workflows/automatic-backport.yml
@@ -21,7 +21,8 @@ on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - main
-
+permissions:
+  contents: read
 jobs:
   get-pr-info:
     name: "Get PR information"
diff --git a/.github/workflows/backport-cli.yml b/.github/workflows/backport-cli.yml
index 3706cd65bb01e..53243006137a6 100644
--- a/.github/workflows/backport-cli.yml
+++ b/.github/workflows/backport-cli.yml
@@ -41,6 +41,9 @@ on:  # yamllint disable-line rule:truthy
         type: string
 
 permissions:
+  # Those permissions are only active for workflow dispatch (only committers can trigger it) and workflow call
+  # Which is triggered automatically by "automatic-backport" push workflow (only when merging by committer)
+  # Branch protection  prevents from pushing to the "code" branches
   contents: write
   pull-requests: write
 jobs:
diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index da803aee31904..847eec3b4ee59 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -60,6 +60,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv in the image"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   run-breeze-tests:
     timeout-minutes: 10
diff --git a/.github/workflows/ci-image-build.yml b/.github/workflows/ci-image-build.yml
index d15c297d82a00..55bf4e046e23f 100644
--- a/.github/workflows/ci-image-build.yml
+++ b/.github/workflows/ci-image-build.yml
@@ -96,6 +96,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Disable airflow repo cache read from main."
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   build-ci-images:
     strategy:
diff --git a/.github/workflows/ci-image-checks.yml b/.github/workflows/ci-image-checks.yml
index 21c857e7bd710..c6784042cec2c 100644
--- a/.github/workflows/ci-image-checks.yml
+++ b/.github/workflows/ci-image-checks.yml
@@ -108,7 +108,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv to build the image (true/false)"
         required: true
         type: string
-
+permissions:
+  contents: read
 jobs:
   install-pre-commit:
     timeout-minutes: 5
diff --git a/.github/workflows/finalize-tests.yml b/.github/workflows/finalize-tests.yml
index 1d0ac8a600c1d..ac13089caf656 100644
--- a/.github/workflows/finalize-tests.yml
+++ b/.github/workflows/finalize-tests.yml
@@ -76,6 +76,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to debug resources or not (true/false)"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   update-constraints:
     runs-on: ${{ fromJSON(inputs.runs-on-as-json-public) }}
diff --git a/.github/workflows/generate-constraints.yml b/.github/workflows/generate-constraints.yml
index 740310e1cc09b..19592dae295c5 100644
--- a/.github/workflows/generate-constraints.yml
+++ b/.github/workflows/generate-constraints.yml
@@ -44,6 +44,12 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uvloop (true/false)"
         required: true
         type: string
+permissions:
+  # This permission is only active for "canary" builds and PRs from the main repo
+  # All fork PRs are not allowed to have write permissions and this one is automatically downgraded to read
+  # Branch protection also prevents from pushing to the "code" branches so we can safely use this one to
+  # Push constraints to "constraints" branches which are non-code branches and are not protected
+  contents: write
 jobs:
   generate-constraints:
     permissions:
diff --git a/.github/workflows/helm-tests.yml b/.github/workflows/helm-tests.yml
index 9dc300c61c0a1..1b4aa19cbe595 100644
--- a/.github/workflows/helm-tests.yml
+++ b/.github/workflows/helm-tests.yml
@@ -40,6 +40,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uvloop (true/false)"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   tests-helm:
     timeout-minutes: 80
diff --git a/.github/workflows/integration-system-tests.yml b/.github/workflows/integration-system-tests.yml
index f992b726e30df..7c3916d9d19c9 100644
--- a/.github/workflows/integration-system-tests.yml
+++ b/.github/workflows/integration-system-tests.yml
@@ -64,6 +64,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   tests-core-integration:
     timeout-minutes: 130
diff --git a/.github/workflows/k8s-tests.yml b/.github/workflows/k8s-tests.yml
index 6f867af65e9cd..40f73e3c59c66 100644
--- a/.github/workflows/k8s-tests.yml
+++ b/.github/workflows/k8s-tests.yml
@@ -48,6 +48,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to debug resources"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   tests-kubernetes:
     timeout-minutes: 60
diff --git a/.github/workflows/news-fragment.yml b/.github/workflows/news-fragment.yml
index 73e58a0193711..46cb294d7a5b9 100644
--- a/.github/workflows/news-fragment.yml
+++ b/.github/workflows/news-fragment.yml
@@ -21,7 +21,8 @@ name: CI
 on:  # yamllint disable-line rule:truthy
   pull_request:
     types: [labeled, unlabeled, opened, reopened, synchronize]
-
+permissions:
+  contents: read
 jobs:
   check-news-fragment:
     name: Check News Fragment
diff --git a/.github/workflows/prod-image-build.yml b/.github/workflows/prod-image-build.yml
index d90d1910f9336..85b421cade447 100644
--- a/.github/workflows/prod-image-build.yml
+++ b/.github/workflows/prod-image-build.yml
@@ -116,8 +116,9 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether this is a prod-image build (true/false)"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
-
   build-prod-packages:
     name: "Build Airflow and provider packages"
     timeout-minutes: 10
diff --git a/.github/workflows/prod-image-extra-checks.yml b/.github/workflows/prod-image-extra-checks.yml
index f5a4b771436a7..56fa4b2b1a28d 100644
--- a/.github/workflows/prod-image-extra-checks.yml
+++ b/.github/workflows/prod-image-extra-checks.yml
@@ -64,6 +64,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Disable airflow repo cache read from main."
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   myssql-client-image:
     uses: ./.github/workflows/prod-image-build.yml
diff --git a/.github/workflows/push-image-cache.yml b/.github/workflows/push-image-cache.yml
index b1c9d12754206..86ec3b2a85a86 100644
--- a/.github/workflows/push-image-cache.yml
+++ b/.github/workflows/push-image-cache.yml
@@ -80,6 +80,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Disable airflow repo cache read from main."
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   push-ci-image-cache:
     name: "Push CI ${{ inputs.cache-type }}:${{ matrix.python }} image cache "
diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml
index 1c24e659d0979..e67d59ee08d37 100644
--- a/.github/workflows/run-unit-tests.yml
+++ b/.github/workflows/run-unit-tests.yml
@@ -116,6 +116,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   tests:
     timeout-minutes: 120
diff --git a/.github/workflows/special-tests.yml b/.github/workflows/special-tests.yml
index 36ccbf871cca9..8507294e535c6 100644
--- a/.github/workflows/special-tests.yml
+++ b/.github/workflows/special-tests.yml
@@ -80,7 +80,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv or not (true/false)"
         required: true
         type: string
-
+permissions:
+  contents: read
 jobs:
   tests-min-sqlalchemy:
     name: "Min SQLAlchemy test"
diff --git a/.github/workflows/task-sdk-tests.yml b/.github/workflows/task-sdk-tests.yml
index 501e880fd3be0..b8ecf0eb798c6 100644
--- a/.github/workflows/task-sdk-tests.yml
+++ b/.github/workflows/task-sdk-tests.yml
@@ -44,7 +44,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether this is a canary run (true/false)"
         required: true
         type: string
-
+permissions:
+  contents: read
 jobs:
   task-sdk-tests:
     timeout-minutes: 80
diff --git a/.github/workflows/test-provider-packages.yml b/.github/workflows/test-provider-packages.yml
index 877ff1f1b23c9..b0912fa6dfe37 100644
--- a/.github/workflows/test-provider-packages.yml
+++ b/.github/workflows/test-provider-packages.yml
@@ -62,6 +62,8 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uv"
         required: true
         type: string
+permissions:
+  contents: read
 jobs:
   prepare-install-verify-provider-packages:
     timeout-minutes: 80

From e8f3be8f23cda7873d1988f3e445a4abe6fd65ca Mon Sep 17 00:00:00 2001
From: Amogh Desai <amoghrajesh1999@gmail.com>
Date: Fri, 10 Jan 2025 18:27:34 +0530
Subject: [PATCH 05/24] AIP-72: Supporting Pulling multiple XCOM values
 (#45509)

Co-Authored-By: Kaxil Naik <kaxilnaik@gmail.com>

closes: https://github.com/apache/airflow/issues/45243
---
 .../airflow/sdk/execution_time/task_runner.py | 56 +++++++++++--------
 .../tests/execution_time/test_task_runner.py  | 38 ++++++++-----
 2 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/task_sdk/src/airflow/sdk/execution_time/task_runner.py b/task_sdk/src/airflow/sdk/execution_time/task_runner.py
index 4b7b50c5ed621..e63252efa9552 100644
--- a/task_sdk/src/airflow/sdk/execution_time/task_runner.py
+++ b/task_sdk/src/airflow/sdk/execution_time/task_runner.py
@@ -165,7 +165,7 @@ def render_templates(
 
     def xcom_pull(
         self,
-        task_ids: str | Iterable[str] | None = None,  # TODO: Simplify to a single task_id? (breaking change)
+        task_ids: str | Iterable[str] | None = None,
         dag_id: str | None = None,
         key: str = "return_value",  # TODO: Make this a constant (``XCOM_RETURN_KEY``)
         include_prior_dates: bool = False,  # TODO: Add support for this
@@ -213,11 +213,10 @@ def xcom_pull(
             run_id = self.run_id
 
         if task_ids is None:
+            # default to the current task if not provided
             task_ids = self.task_id
-        elif not isinstance(task_ids, str) and isinstance(task_ids, Iterable):
-            # TODO: Handle multiple task_ids or remove support
-            raise NotImplementedError("Multiple task_ids are not supported yet")
-
+        elif isinstance(task_ids, str):
+            task_ids = [task_ids]
         if map_indexes is None:
             map_indexes = self.map_index
         elif isinstance(map_indexes, Iterable):
@@ -225,28 +224,37 @@ def xcom_pull(
             raise NotImplementedError("Multiple map_indexes are not supported yet")
 
         log = structlog.get_logger(logger_name="task")
-        SUPERVISOR_COMMS.send_request(
-            log=log,
-            msg=GetXCom(
-                key=key,
-                dag_id=dag_id,
-                task_id=task_ids,
-                run_id=run_id,
-                map_index=map_indexes,
-            ),
-        )
 
-        msg = SUPERVISOR_COMMS.get_message()
-        if TYPE_CHECKING:
-            assert isinstance(msg, XComResult)
+        xcoms = []
+        for t in task_ids:
+            SUPERVISOR_COMMS.send_request(
+                log=log,
+                msg=GetXCom(
+                    key=key,
+                    dag_id=dag_id,
+                    task_id=t,
+                    run_id=run_id,
+                    map_index=map_indexes,
+                ),
+            )
+
+            msg = SUPERVISOR_COMMS.get_message()
+            if not isinstance(msg, XComResult):
+                raise TypeError(f"Expected XComResult, received: {type(msg)} {msg}")
+
+            if msg.value is not None:
+                from airflow.models.xcom import XCom
 
-        if msg.value is not None:
-            from airflow.models.xcom import XCom
+                # TODO: Move XCom serialization & deserialization to Task SDK
+                #   https://github.com/apache/airflow/issues/45231
+                xcom = XCom.deserialize_value(msg)  # type: ignore[arg-type]
+                xcoms.append(xcom)
+            else:
+                xcoms.append(default)
 
-            # TODO: Move XCom serialization & deserialization to Task SDK
-            #   https://github.com/apache/airflow/issues/45231
-            return XCom.deserialize_value(msg)  # type: ignore[arg-type]
-        return default
+        if len(xcoms) == 1:
+            return xcoms[0]
+        return xcoms
 
     def xcom_push(self, key: str, value: Any):
         """
diff --git a/task_sdk/tests/execution_time/test_task_runner.py b/task_sdk/tests/execution_time/test_task_runner.py
index e93287064f30d..3dc06379cdffa 100644
--- a/task_sdk/tests/execution_time/test_task_runner.py
+++ b/task_sdk/tests/execution_time/test_task_runner.py
@@ -735,14 +735,20 @@ def test_get_variable_from_context(
 
         assert var_from_context == Variable(key="test_key", value=expected_value)
 
-    def test_xcom_pull(self, create_runtime_ti, mock_supervisor_comms, spy_agency):
+    @pytest.mark.parametrize(
+        "task_ids",
+        [
+            "push_task",
+            ["push_task1", "push_task2"],
+            {"push_task1", "push_task2"},
+        ],
+    )
+    def test_xcom_pull(self, create_runtime_ti, mock_supervisor_comms, spy_agency, task_ids):
         """Test that a task pulls the expected XCom value if it exists."""
 
-        task_id = "push_task"
-
         class CustomOperator(BaseOperator):
             def execute(self, context):
-                value = context["ti"].xcom_pull(task_ids=task_id, key="key")
+                value = context["ti"].xcom_pull(task_ids=task_ids, key="key")
                 print(f"Pulled XCom Value: {value}")
 
         task = CustomOperator(task_id="pull_task")
@@ -755,16 +761,20 @@ def execute(self, context):
 
         run(runtime_ti, log=mock.MagicMock())
 
-        mock_supervisor_comms.send_request.assert_any_call(
-            log=mock.ANY,
-            msg=GetXCom(
-                key="key",
-                dag_id="test_dag",
-                run_id="test_run",
-                task_id=task_id,
-                map_index=None,
-            ),
-        )
+        if isinstance(task_ids, str):
+            task_ids = [task_ids]
+
+        for task_id in task_ids:
+            mock_supervisor_comms.send_request.assert_any_call(
+                log=mock.ANY,
+                msg=GetXCom(
+                    key="key",
+                    dag_id="test_dag",
+                    run_id="test_run",
+                    task_id=task_id,
+                    map_index=None,
+                ),
+            )
 
 
 class TestXComAfterTaskExecution:

From fcef600a7e60bcd625977cbc4e4546a7c4f799b0 Mon Sep 17 00:00:00 2001
From: Park Jiwon <57484954+david-parkk@users.noreply.github.com>
Date: Fri, 10 Jan 2025 22:11:22 +0900
Subject: [PATCH 06/24] fix code indent in modified docker-compose.yaml for
 PyCharm (#45545)

---
 docs/apache-airflow/howto/docker-compose/index.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/apache-airflow/howto/docker-compose/index.rst b/docs/apache-airflow/howto/docker-compose/index.rst
index 96ec9b53e3a9f..65151c22e0656 100644
--- a/docs/apache-airflow/howto/docker-compose/index.rst
+++ b/docs/apache-airflow/howto/docker-compose/index.rst
@@ -373,13 +373,13 @@ Steps:
 .. code-block:: yaml
 
     airflow-python:
-    <<: *airflow-common
-    profiles:
-        - debug
-    environment:
-        <<: *airflow-common-env
-    user: "50000:0"
-    entrypoint: [ "/bin/bash", "-c" ]
+      <<: *airflow-common
+      profiles:
+          - debug
+      environment:
+          <<: *airflow-common-env
+      user: "50000:0"
+      entrypoint: [ "/bin/bash", "-c" ]
 
 .. note::
 

From 7dec7e8fa04ef663a21b39b030fd1e025e401652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salih=20G=C3=B6ktu=C4=9F=20K=C3=B6se?=
 <34631089+goktugkose@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:12:46 +0300
Subject: [PATCH 07/24] Upgrade pgBouncer version to 1.24.0 (#45542)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As of version 1.23.0, pgBouncer introduced support for rolling restarts. This feature allows users to seamlessly restart PgBouncer instances without disrupting active connections. For Airflow users managing PgBouncer on Kubernetes, this enhancement simplifies maintenance and upgrades, ensuring high availability and minimal downtime for critical workflows.

Co-authored-by: Salih Göktuğ Köse <goktug.kose@trendyol.com>
---
 chart/dockerfiles/pgbouncer/build_and_push.sh | 6 +++---
 chart/values.schema.json                      | 2 +-
 chart/values.yaml                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chart/dockerfiles/pgbouncer/build_and_push.sh b/chart/dockerfiles/pgbouncer/build_and_push.sh
index cede5ab8b0ab3..e4345cc44d018 100755
--- a/chart/dockerfiles/pgbouncer/build_and_push.sh
+++ b/chart/dockerfiles/pgbouncer/build_and_push.sh
@@ -22,13 +22,13 @@ readonly DOCKERHUB_USER
 DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
 readonly DOCKERHUB_REPO
 
-PGBOUNCER_VERSION="1.22.1"
+PGBOUNCER_VERSION="1.24.0"
 readonly PGBOUNCER_VERSION
 
-PGBOUNCER_SHA256="2b018aa6ce7f592c9892bb9e0fd90262484eb73937fd2af929770a45373ba215"
+PGBOUNCER_SHA256="e76adf941a3191a416e223c0b2cdbf73159eef80a2a32314af6fbd82e41a1d41"
 readonly PGBOUNCER_SHA256
 
-AIRFLOW_PGBOUNCER_VERSION="2024.09.19"
+AIRFLOW_PGBOUNCER_VERSION="2025.01.10"
 readonly AIRFLOW_PGBOUNCER_VERSION
 
 COMMIT_SHA=$(git rev-parse HEAD)
diff --git a/chart/values.schema.json b/chart/values.schema.json
index fedae1557ab6b..e8c1d1f2cfe54 100644
--- a/chart/values.schema.json
+++ b/chart/values.schema.json
@@ -887,7 +887,7 @@
                         "tag": {
                             "description": "The PgBouncer image tag.",
                             "type": "string",
-                            "default": "airflow-pgbouncer-2024.09.19-1.22.1"
+                            "default": "airflow-pgbouncer-2025.01.10-1.24.0"
                         },
                         "pullPolicy": {
                             "description": "The PgBouncer image pull policy.",
diff --git a/chart/values.yaml b/chart/values.yaml
index c0764fb54a0d7..73e00ed4281d8 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -115,7 +115,7 @@ images:
     pullPolicy: IfNotPresent
   pgbouncer:
     repository: apache/airflow
-    tag: airflow-pgbouncer-2024.09.19-1.22.1
+    tag: airflow-pgbouncer-2025.01.10-1.24.0
     pullPolicy: IfNotPresent
   pgbouncerExporter:
     repository: apache/airflow

From 32787abd5d1d08e033c38a2cd29a7c200f86d5a6 Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 10 Jan 2025 16:24:21 +0100
Subject: [PATCH 08/24] Revert "Pin pnpm action to hash commit following best
 GH Action practices (#45547)" (#45557)

This reverts commit 378e3581f31dfcc6dfa4661d07643ea07b2406bb.
---
 .github/workflows/basic-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
index 847eec3b4ee59..5cb71cb7f5c1f 100644
--- a/.github/workflows/basic-tests.yml
+++ b/.github/workflows/basic-tests.yml
@@ -100,7 +100,7 @@ jobs:
       - name: "Cleanup docker"
         run: ./scripts/ci/cleanup_docker.sh
       - name: Setup pnpm
-        uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2  # v4.0.0
+        uses: pnpm/action-setup@v4.0.0
         with:
           version: 9
           run_install: false

From ae32ebcc3c637902b8e62d549a02d537be76343c Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Fri, 10 Jan 2025 16:24:33 +0100
Subject: [PATCH 09/24] Remove contents: write permission from
 generate-constraints (#45558)

The write permission cannot be set for PRs from forks in the
call workflow - so we have to come back to implicit permissions
and make explicit permissions passing a bit differently.
---
 .github/workflows/generate-constraints.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/generate-constraints.yml b/.github/workflows/generate-constraints.yml
index 19592dae295c5..740310e1cc09b 100644
--- a/.github/workflows/generate-constraints.yml
+++ b/.github/workflows/generate-constraints.yml
@@ -44,12 +44,6 @@ on:  # yamllint disable-line rule:truthy
         description: "Whether to use uvloop (true/false)"
         required: true
         type: string
-permissions:
-  # This permission is only active for "canary" builds and PRs from the main repo
-  # All fork PRs are not allowed to have write permissions and this one is automatically downgraded to read
-  # Branch protection also prevents from pushing to the "code" branches so we can safely use this one to
-  # Push constraints to "constraints" branches which are non-code branches and are not protected
-  contents: write
 jobs:
   generate-constraints:
     permissions:

From db739d911437d2bf62ef321b9f43cd2921194e0b Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
Date: Fri, 10 Jan 2025 21:11:27 +0530
Subject: [PATCH 10/24] Don't display table/card header and pagination when no
 rows are present. (#45501)

* Don't display table/card and pagination when no rows are present.

* Refactor hasRows check to front.
---
 .../ui/src/components/DataTable/DataTable.tsx | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/airflow/ui/src/components/DataTable/DataTable.tsx b/airflow/ui/src/components/DataTable/DataTable.tsx
index 3a2086a040e96..4f02b57cb8a6e 100644
--- a/airflow/ui/src/components/DataTable/DataTable.tsx
+++ b/airflow/ui/src/components/DataTable/DataTable.tsx
@@ -115,33 +115,34 @@ export const DataTable = <TData,>({
   const { rows } = table.getRowModel();
 
   const display = displayMode === "card" && Boolean(cardDef) ? "card" : "table";
+  const hasRows = rows.length > 0;
 
   return (
     <>
       <ProgressBar size="xs" visibility={Boolean(isFetching) && !Boolean(isLoading) ? "visible" : "hidden"} />
       <Toaster />
       {errorMessage}
-      {display === "table" && <TableList table={table} />}
-      {display === "card" && cardDef !== undefined && (
+      {hasRows && display === "table" ? <TableList table={table} /> : undefined}
+      {hasRows && display === "card" && cardDef !== undefined ? (
         <CardList cardDef={cardDef} isLoading={isLoading} table={table} />
-      )}
-      {!Boolean(isLoading) && !rows.length && (
-        <Text pt={1}>{noRowsMessage ?? `No ${modelName}s found.`}</Text>
-      )}
-      <Pagination.Root
-        count={table.getRowCount()}
-        my={2}
-        onPageChange={(page) => table.setPageIndex(page.page - 1)}
-        page={table.getState().pagination.pageIndex + 1}
-        pageSize={table.getState().pagination.pageSize}
-        siblingCount={1}
-      >
-        <HStack>
-          <Pagination.PrevTrigger data-testid="prev" />
-          <Pagination.Items />
-          <Pagination.NextTrigger data-testid="next" />
-        </HStack>
-      </Pagination.Root>
+      ) : undefined}
+      {!hasRows && !Boolean(isLoading) && <Text pt={1}>{noRowsMessage ?? `No ${modelName}s found.`}</Text>}
+      {hasRows ? (
+        <Pagination.Root
+          count={table.getRowCount()}
+          my={2}
+          onPageChange={(page) => table.setPageIndex(page.page - 1)}
+          page={table.getState().pagination.pageIndex + 1}
+          pageSize={table.getState().pagination.pageSize}
+          siblingCount={1}
+        >
+          <HStack>
+            <Pagination.PrevTrigger data-testid="prev" />
+            <Pagination.Items />
+            <Pagination.NextTrigger data-testid="next" />
+          </HStack>
+        </Pagination.Root>
+      ) : undefined}
     </>
   );
 };

From bae4bb1d549f20a54a2e8c27c57377a0207f393b Mon Sep 17 00:00:00 2001
From: luoyuliuyin <luoyuliuyin@gmail.com>
Date: Fri, 10 Jan 2025 23:52:11 +0800
Subject: [PATCH 11/24] fix: log action get the correct request body (#45546)

---
 airflow/www/decorators.py                     |  2 +-
 .../endpoints/test_dag_run_endpoint.py        | 56 +++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/airflow/www/decorators.py b/airflow/www/decorators.py
index 0651820ce78d7..f373990a4c919 100644
--- a/airflow/www/decorators.py
+++ b/airflow/www/decorators.py
@@ -95,7 +95,7 @@ def wrapper(*args, **kwargs):
                     user_display = get_auth_manager().get_user_display_name()
 
                 isAPIRequest = request.blueprint == "/api/v1"
-                hasJsonBody = request.headers.get("content-type") == "application/json" and request.json
+                hasJsonBody = "application/json" in request.headers.get("content-type") and request.json
 
                 fields_skip_logging = {
                     "csrf_token",
diff --git a/tests/api_connexion/endpoints/test_dag_run_endpoint.py b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
index 4f322bb8f0a6c..4a0d18ff48cf9 100644
--- a/tests/api_connexion/endpoints/test_dag_run_endpoint.py
+++ b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
@@ -16,6 +16,7 @@
 # under the License.
 from __future__ import annotations
 
+import json
 import urllib
 from datetime import timedelta
 from unittest import mock
@@ -24,6 +25,7 @@
 import time_machine
 
 from airflow.api_connexion.exceptions import EXCEPTIONS_LINK_MAP
+from airflow.models import Log
 from airflow.models.asset import AssetEvent, AssetModel
 from airflow.models.dag import DAG, DagModel
 from airflow.models.dagrun import DagRun
@@ -1522,6 +1524,60 @@ def test_should_respond_200(self, state, run_type, dag_maker, session):
         assert response.status_code == 200
         assert response.json == expected_response_json
 
+    @pytest.mark.parametrize("state", ["failed", "success", "queued"])
+    @pytest.mark.parametrize("run_type", [state.value for state in DagRunType])
+    def test_action_logging(self, state, run_type, dag_maker, session):
+        dag_id = "TEST_DAG_ID"
+        dag_run_id = "TEST_DAG_RUN_ID"
+        with dag_maker(dag_id) as dag:
+            task = EmptyOperator(task_id="task_id", dag=dag)
+        self.app.dag_bag.bag_dag(dag, root_dag=dag)
+        dr = dag_maker.create_dagrun(run_id=dag_run_id, run_type=run_type)
+        ti = dr.get_task_instance(task_id="task_id")
+        ti.task = task
+        ti.state = State.RUNNING
+        session.merge(ti)
+        session.commit()
+
+        request_json = {"state": state}
+
+        self.client.patch(
+            f"api/v1/dags/{dag_id}/dagRuns/{dag_run_id}",
+            json=request_json,
+            environ_overrides={"REMOTE_USER": "test"},
+        )
+
+        log = (
+            session.query(Log)
+            .filter(
+                Log.dag_id == dag_id,
+                Log.run_id == dag_run_id,
+                Log.event == "api.update_dag_run_state",
+            )
+            .order_by(Log.id.desc())
+            .first()
+        )
+        assert log.extra == json.dumps(request_json)
+
+        self.client.patch(
+            f"api/v1/dags/{dag_id}/dagRuns/{dag_run_id}",
+            json=request_json,
+            environ_overrides={"REMOTE_USER": "test"},
+            headers={"content-type": "application/json; charset=utf-8"},
+        )
+
+        log = (
+            session.query(Log)
+            .filter(
+                Log.dag_id == dag_id,
+                Log.run_id == dag_run_id,
+                Log.event == "api.update_dag_run_state",
+            )
+            .order_by(Log.id.desc())
+            .first()
+        )
+        assert log.extra == json.dumps(request_json)
+
     def test_schema_validation_error_raises(self, dag_maker, session):
         dag_id = "TEST_DAG_ID"
         dag_run_id = "TEST_DAG_RUN_ID"

From f3fd262de274b4fd1e26d36f9cead0a56775a309 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 18:18:00 +0100
Subject: [PATCH 12/24] Bump trove-classifiers from 2025.1.7.14 to 2025.1.10.15
 (#45561)

Bumps [trove-classifiers](https://github.com/pypa/trove-classifiers) from 2025.1.7.14 to 2025.1.10.15.
- [Release notes](https://github.com/pypa/trove-classifiers/releases)
- [Commits](https://github.com/pypa/trove-classifiers/compare/2025.1.7.14...2025.1.10.15)

---
updated-dependencies:
- dependency-name: trove-classifiers
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index d09cd1aa927ee..206923faae963 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,7 +30,7 @@ requires = [
     "pluggy==1.5.0",
     "smmap==5.0.2",
     "tomli==2.2.1; python_version < '3.11'",
-    "trove-classifiers==2025.1.7.14",
+    "trove-classifiers==2025.1.10.15",
 ]
 build-backend = "hatchling.build"
 

From ef79854f10fd5b0de95379efd78fa648dd589c3f Mon Sep 17 00:00:00 2001
From: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:43:20 -0700
Subject: [PATCH 13/24] Add a bundle for example dags when enabled (#45533)

Once we start parsing from bundles, we will have a separate bundle to
represent the example dags, instead of simply adding them to the list of
files from the dags folder like we do today.
---
 airflow/dag_processing/bundles/manager.py       | 17 +++++++++++++++++
 .../bundles/test_dag_bundle_manager.py          | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/airflow/dag_processing/bundles/manager.py b/airflow/dag_processing/bundles/manager.py
index 0a17ab3f8c5f5..49cccc02849e8 100644
--- a/airflow/dag_processing/bundles/manager.py
+++ b/airflow/dag_processing/bundles/manager.py
@@ -64,6 +64,23 @@ def parse_config(self) -> None:
                 "Bundle config is not a list. Check config value"
                 " for section `dag_bundles` and key `backends`."
             )
+
+        # example dags!
+        if conf.getboolean("core", "LOAD_EXAMPLES"):
+            from airflow import example_dags
+
+            example_dag_folder = next(iter(example_dags.__path__))
+            backends.append(
+                {
+                    "name": "example_dags",
+                    "classpath": "airflow.dag_processing.bundles.local.LocalDagBundle",
+                    "kwargs": {
+                        "local_folder": example_dag_folder,
+                        "refresh_interval": conf.getint("scheduler", "dag_dir_list_interval"),
+                    },
+                }
+            )
+
         seen = set()
         for cfg in backends:
             name = cfg["name"]
diff --git a/tests/dag_processing/bundles/test_dag_bundle_manager.py b/tests/dag_processing/bundles/test_dag_bundle_manager.py
index 47b192efc198f..eee7dee211472 100644
--- a/tests/dag_processing/bundles/test_dag_bundle_manager.py
+++ b/tests/dag_processing/bundles/test_dag_bundle_manager.py
@@ -68,7 +68,9 @@
 )
 def test_parse_bundle_config(value, expected):
     """Test that bundle_configs are read from configuration."""
-    envs = {"AIRFLOW__DAG_BUNDLES__BACKENDS": value} if value else {}
+    envs = {"AIRFLOW__CORE__LOAD_EXAMPLES": "False"}
+    if value:
+        envs["AIRFLOW__DAG_BUNDLES__BACKENDS"] = value
     cm = nullcontext()
     exp_fail = False
     if isinstance(expected, str):
@@ -133,6 +135,7 @@ def clear_db():
 
 
 @pytest.mark.db_test
+@conf_vars({("core", "LOAD_EXAMPLES"): "False"})
 def test_sync_bundles_to_db(clear_db):
     def _get_bundle_names_and_active():
         with create_session() as session:
@@ -167,3 +170,14 @@ def test_view_url(version):
     with patch.object(BaseDagBundle, "view_url") as view_url_mock:
         bundle_manager.view_url("my-test-bundle", version=version)
     view_url_mock.assert_called_once_with(version=version)
+
+
+def test_example_dags_bundle_added():
+    manager = DagBundlesManager()
+    manager.parse_config()
+    assert "example_dags" in manager._bundle_config
+
+    with conf_vars({("core", "LOAD_EXAMPLES"): "False"}):
+        manager = DagBundlesManager()
+        manager.parse_config()
+        assert "example_dags" not in manager._bundle_config

From 2f64780ca58d3f23c22d7ef24ab8520bebdd01b1 Mon Sep 17 00:00:00 2001
From: Jed Cunningham <66968678+jedcunningham@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:37:48 -0700
Subject: [PATCH 14/24] Reserve the 'example_dags' bundle name (#45566)

Users can enable example dags with config, so we will reserve the bundle
name, as it's added automatically based on that config.
---
 airflow/dag_processing/bundles/manager.py               | 6 ++++++
 tests/dag_processing/bundles/test_dag_bundle_manager.py | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/airflow/dag_processing/bundles/manager.py b/airflow/dag_processing/bundles/manager.py
index 49cccc02849e8..1ae751f8d3304 100644
--- a/airflow/dag_processing/bundles/manager.py
+++ b/airflow/dag_processing/bundles/manager.py
@@ -65,6 +65,12 @@ def parse_config(self) -> None:
                 " for section `dag_bundles` and key `backends`."
             )
 
+        if any(b["name"] == "example_dags" for b in backends):
+            raise AirflowConfigException(
+                "Bundle name 'example_dags' is a reserved name. Please choose another name for your bundle."
+                " Example DAGs can be enabled with the '[core] load_examples' config."
+            )
+
         # example dags!
         if conf.getboolean("core", "LOAD_EXAMPLES"):
             from airflow import example_dags
diff --git a/tests/dag_processing/bundles/test_dag_bundle_manager.py b/tests/dag_processing/bundles/test_dag_bundle_manager.py
index eee7dee211472..35cecdace6c1f 100644
--- a/tests/dag_processing/bundles/test_dag_bundle_manager.py
+++ b/tests/dag_processing/bundles/test_dag_bundle_manager.py
@@ -181,3 +181,10 @@ def test_example_dags_bundle_added():
         manager = DagBundlesManager()
         manager.parse_config()
         assert "example_dags" not in manager._bundle_config
+
+
+def test_example_dags_name_is_reserved():
+    reserved_name_config = [{"name": "example_dags"}]
+    with conf_vars({("dag_bundles", "backends"): json.dumps(reserved_name_config)}):
+        with pytest.raises(AirflowConfigException, match="Bundle name 'example_dags' is a reserved name."):
+            DagBundlesManager().parse_config()

From a467fc386d1e39af3210eed7cdc53b3d142fbde1 Mon Sep 17 00:00:00 2001
From: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
Date: Fri, 10 Jan 2025 23:38:13 +0200
Subject: [PATCH 15/24] Fix typo in README_RELEASE_AIRFLOW.md (#45568)

---
 dev/README_RELEASE_AIRFLOW.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/README_RELEASE_AIRFLOW.md b/dev/README_RELEASE_AIRFLOW.md
index 261e463589c05..3fa033b4a5952 100644
--- a/dev/README_RELEASE_AIRFLOW.md
+++ b/dev/README_RELEASE_AIRFLOW.md
@@ -892,7 +892,7 @@ Documentation for providers can be found in the ``/docs/apache-airflow`` directo
     # and finally open a PR
     ```
 
-The `--run-in-parallell` switch allows to speed up SBOM generation significantly, but it might take a lot
+The `--run-in-parallel` switch allows to speed up SBOM generation significantly, but it might take a lot
 of memory - if you are running into memory issues you can limit parallelism by setting `--parallelism N`
 where N is a number of parallel `cdxgen` servers that should be started.
 

From 46304d8d7e5e0d47e3829ae51401e8a4b9bfc4ae Mon Sep 17 00:00:00 2001
From: Daniel Standish <15932138+dstandish@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:42:00 -0800
Subject: [PATCH 16/24] Fix log_action decorator when content type is None
 (#45567)

---
 airflow/www/decorators.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow/www/decorators.py b/airflow/www/decorators.py
index f373990a4c919..9a916da184c13 100644
--- a/airflow/www/decorators.py
+++ b/airflow/www/decorators.py
@@ -95,7 +95,7 @@ def wrapper(*args, **kwargs):
                     user_display = get_auth_manager().get_user_display_name()
 
                 isAPIRequest = request.blueprint == "/api/v1"
-                hasJsonBody = "application/json" in request.headers.get("content-type") and request.json
+                hasJsonBody = "application/json" in request.headers.get("content-type", "") and request.json
 
                 fields_skip_logging = {
                     "csrf_token",

From a2d5a2543b7026a1e743ea825cd66b6b1ebc8e93 Mon Sep 17 00:00:00 2001
From: Ash Berlin-Taylor <ash@apache.org>
Date: Fri, 10 Jan 2025 22:51:43 +0000
Subject: [PATCH 17/24] Improve subclassing of TaskSDK's WatchedSubprocess
 (#45570)

When I added the DagFileProcessorProcess I did some naughty things with
subclassing and lying to the type checker, and this is now stopping us easily
adding DAG bundles (because as it is structured right now we would have to
change both parsing and execution at the same time, or make the type checker
_even more unhappy_.)

This more correctly separates the two classes -- essentially anything that
used `self.client` couldn't have been called from a DagFileProcessorProcess
(as client was always None for those instances).

This PR fixes it by adding a new `ActivitySubprocess` which is the type used
at Execution time (the one that always has the client) and the base behaviour
kept in WatchedSubprocess.
---
 airflow/dag_processing/processor.py           |  39 +--
 .../airflow/sdk/execution_time/supervisor.py  | 291 ++++++++++--------
 .../tests/execution_time/test_supervisor.py   |  30 +-
 tests/dag_processing/test_manager.py          |  10 +-
 4 files changed, 191 insertions(+), 179 deletions(-)

diff --git a/airflow/dag_processing/processor.py b/airflow/dag_processing/processor.py
index 8d48b5ab6aeb3..583b858b585a6 100644
--- a/airflow/dag_processing/processor.py
+++ b/airflow/dag_processing/processor.py
@@ -19,7 +19,6 @@
 import os
 import sys
 import traceback
-from collections.abc import Generator
 from typing import TYPE_CHECKING, Annotated, Callable, Literal, Union
 
 import attrs
@@ -181,7 +180,7 @@ class DagFileParsingResult(BaseModel):
 ]
 
 
-@attrs.define()
+@attrs.define(kw_only=True)
 class DagFileProcessorProcess(WatchedSubprocess):
     """
     Parses dags with Task SDK API.
@@ -194,6 +193,7 @@ class DagFileProcessorProcess(WatchedSubprocess):
     """
 
     parsing_result: DagFileParsingResult | None = None
+    decoder: TypeAdapter[ToParent] = TypeAdapter[ToParent](ToParent)
 
     @classmethod
     def start(  # type: ignore[override]
@@ -203,39 +203,30 @@ def start(  # type: ignore[override]
         target: Callable[[], None] = _parse_file_entrypoint,
         **kwargs,
     ) -> Self:
-        return super().start(path, callbacks, target=target, client=None, **kwargs)  # type:ignore[arg-type]
+        proc = super().start(target=target, **kwargs)
+        proc._on_child_started(callbacks, path)
+        return proc
 
-    def _on_child_started(  # type: ignore[override]
-        self, callbacks: list[CallbackRequest], path: str | os.PathLike[str], child_comms_fd: int
-    ) -> None:
+    def _on_child_started(self, callbacks: list[CallbackRequest], path: str | os.PathLike[str]) -> None:
         msg = DagFileParseRequest(
             file=os.fspath(path),
-            requests_fd=child_comms_fd,
+            requests_fd=self._requests_fd,
             callback_requests=callbacks,
         )
         self.stdin.write(msg.model_dump_json().encode() + b"\n")
 
-    def handle_requests(self, log: FilteringBoundLogger) -> Generator[None, bytes, None]:
-        # TODO: Make decoder an instance variable, then this can live in the base class
-        decoder = TypeAdapter[ToParent](ToParent)
-
-        while True:
-            line = yield
-
-            try:
-                msg = decoder.validate_json(line)
-            except Exception:
-                log.exception("Unable to decode message", line=line)
-                continue
-
-            self._handle_request(msg, log)  # type: ignore[arg-type]
-
     def _handle_request(self, msg: ToParent, log: FilteringBoundLogger) -> None:  # type: ignore[override]
+        # TODO: GetVariable etc -- parsing a dag can run top level code that asks for an Airflow Variable
+        resp = None
         if isinstance(msg, DagFileParsingResult):
             self.parsing_result = msg
             return
-        # GetVariable etc -- parsing a dag can run top level code that asks for an Airflow Variable
-        super()._handle_request(msg, log)
+        else:
+            log.error("Unhandled request", msg=msg)
+            return
+
+        if resp:
+            self.stdin.write(resp + b"\n")
 
     @property
     def is_ready(self) -> bool:
diff --git a/task_sdk/src/airflow/sdk/execution_time/supervisor.py b/task_sdk/src/airflow/sdk/execution_time/supervisor.py
index c9cec771ea081..b4415e5728f33 100644
--- a/task_sdk/src/airflow/sdk/execution_time/supervisor.py
+++ b/task_sdk/src/airflow/sdk/execution_time/supervisor.py
@@ -83,7 +83,7 @@
     from airflow.typing_compat import Self
 
 
-__all__ = ["WatchedSubprocess", "supervise"]
+__all__ = ["ActivitySubprocess", "WatchedSubprocess", "supervise"]
 
 log: FilteringBoundLogger = structlog.get_logger(logger_name="supervisor")
 
@@ -284,44 +284,26 @@ def exit(n: int) -> NoReturn:
             exit(125)
 
 
-@attrs.define()
+@attrs.define(kw_only=True)
 class WatchedSubprocess:
     id: UUID
-    pid: int
 
+    pid: int
     stdin: BinaryIO
     """The handle connected to stdin of the child process"""
 
-    client: Client
+    decoder: TypeAdapter
 
     _process: psutil.Process
+    _requests_fd: int
     _num_open_sockets: int = 4
     _exit_code: int | None = attrs.field(default=None, init=False)
-    _terminal_state: str | None = attrs.field(default=None, init=False)
-    _final_state: str | None = attrs.field(default=None, init=False)
-
-    _last_successful_heartbeat: float = attrs.field(default=0, init=False)
-    _last_heartbeat_attempt: float = attrs.field(default=0, init=False)
-
-    # After the failure of a heartbeat, we'll increment this counter. If it reaches `MAX_FAILED_HEARTBEATS`, we
-    # will kill the process. This is to handle temporary network issues etc. ensuring that the process
-    # does not hang around forever.
-    failed_heartbeats: int = attrs.field(default=0, init=False)
-
-    # Maximum possible time (in seconds) that task will have for execution of auxiliary processes
-    # like listeners after task is complete.
-    # TODO: This should come from airflow.cfg: [core] task_success_overtime
-    TASK_OVERTIME_THRESHOLD: ClassVar[float] = 20.0
-    _task_end_time_monotonic: float | None = attrs.field(default=None, init=False)
 
     selector: selectors.BaseSelector = attrs.field(factory=selectors.DefaultSelector)
 
     @classmethod
     def start(
         cls,
-        path: str | os.PathLike[str],
-        what: TaskInstance,
-        client: Client,
         target: Callable[[], None] = _subprocess_main,
         logger: FilteringBoundLogger | None = None,
         **constructor_kwargs,
@@ -342,9 +324,7 @@ def start(
 
             # Python GC should delete these for us, but lets make double sure that we don't keep anything
             # around in the forked processes, especially things that might involve open files or sockets!
-            del path
-            del client
-            del what
+            del constructor_kwargs
             del logger
 
             # Run the child entrypoint
@@ -357,11 +337,10 @@ def start(
         cls._close_unused_sockets(child_stdin, child_stdout, child_stderr, child_comms, child_logs)
 
         proc = cls(
-            id=constructor_kwargs.pop("id", None) or getattr(what, "id"),
             pid=pid,
             stdin=feed_stdin,
             process=psutil.Process(pid),
-            client=client,
+            requests_fd=requests_fd,
             **constructor_kwargs,
         )
 
@@ -374,9 +353,6 @@ def start(
             logs=read_logs,
         )
 
-        # Tell the task process what it needs to do!
-        proc._on_child_started(what, path, requests_fd)
-
         return proc
 
     def _register_pipe_readers(
@@ -417,42 +393,28 @@ def _on_socket_closed(self):
         # We want to keep servicing this process until we've read up to EOF from all the sockets.
         self._num_open_sockets -= 1
 
+    def handle_requests(self, log: FilteringBoundLogger) -> Generator[None, bytes, None]:
+        """Handle incoming requests from the task process, respond with the appropriate data."""
+        while True:
+            line = yield
+
+            try:
+                msg = self.decoder.validate_json(line)
+            except Exception:
+                log.exception("Unable to decode message", line=line)
+                continue
+
+            self._handle_request(msg, log)
+
+    def _handle_request(self, msg, log: FilteringBoundLogger) -> None:
+        raise NotImplementedError()
+
     @staticmethod
     def _close_unused_sockets(*sockets):
         """Close unused ends of sockets after fork."""
         for sock in sockets:
             sock.close()
 
-    def _on_child_started(self, ti: TaskInstance, path: str | os.PathLike[str], requests_fd: int):
-        """Send startup message to the subprocess."""
-        try:
-            # We've forked, but the task won't start doing anything until we send it the StartupDetails
-            # message. But before we do that, we need to tell the server it's started (so it has the chance to
-            # tell us "no, stop!" for any reason)
-            ti_context = self.client.task_instances.start(ti.id, self.pid, datetime.now(tz=timezone.utc))
-            self._last_successful_heartbeat = time.monotonic()
-        except Exception:
-            # On any error kill that subprocess!
-            self.kill(signal.SIGKILL)
-            raise
-
-        msg = StartupDetails.model_construct(
-            ti=ti,
-            file=os.fspath(path),
-            requests_fd=requests_fd,
-            ti_context=ti_context,
-        )
-
-        # Send the message to tell the process what it needs to execute
-        log.debug("Sending", msg=msg)
-
-        try:
-            self.stdin.write(msg.model_dump_json().encode())
-            self.stdin.write(b"\n")
-        except BrokenPipeError:
-            # Debug is fine, the process will have shown _something_ in it's last_chance exception handler
-            log.debug("Couldn't send startup message to Subprocess - it died very early", pid=self.pid)
-
     def kill(
         self,
         signal_to_send: signal.Signals = signal.SIGINT,
@@ -510,6 +472,137 @@ def kill(
 
         log.error("Failed to terminate process after full escalation", pid=self.pid)
 
+    def wait(self) -> int:
+        raise NotImplementedError()
+
+    def __rich_repr__(self):
+        yield "id", self.id
+        yield "pid", self.pid
+        # only include this if it's not the default (third argument)
+        yield "exit_code", self._exit_code, None
+
+    __rich_repr__.angular = True  # type: ignore[attr-defined]
+
+    def __repr__(self) -> str:
+        rep = f"<{type(self).__name__} id={self.id} pid={self.pid}"
+        if self._exit_code is not None:
+            rep += f" exit_code={self._exit_code}"
+        return rep + " >"
+
+    def _service_subprocess(self, max_wait_time: float, raise_on_timeout: bool = False):
+        """
+        Service subprocess events by processing socket activity and checking for process exit.
+
+        This method:
+        - Waits for activity on the registered file objects (via `self.selector.select`).
+        - Processes any events triggered on these file objects.
+        - Checks if the subprocess has exited during the wait.
+
+        :param max_wait_time: Maximum time to block while waiting for events, in seconds.
+        :param raise_on_timeout: If True, raise an exception if the subprocess does not exit within the timeout.
+        :returns: The process exit code, or None if it's still alive
+        """
+        events = self.selector.select(timeout=max_wait_time)
+        for key, _ in events:
+            # Retrieve the handler responsible for processing this file object (e.g., stdout, stderr)
+            socket_handler = key.data
+
+            # Example of handler behavior:
+            # If the subprocess writes "Hello, World!" to stdout:
+            # - `socket_handler` reads and processes the message.
+            # - If EOF is reached, the handler returns False to signal no more reads are expected.
+            need_more = socket_handler(key.fileobj)
+
+            # If the handler signals that the file object is no longer needed (EOF, closed, etc.)
+            # unregister it from the selector to stop monitoring; `wait()` blocks until all selectors
+            # are removed.
+            if not need_more:
+                self.selector.unregister(key.fileobj)
+                key.fileobj.close()  # type: ignore[union-attr]
+
+        # Check if the subprocess has exited
+        return self._check_subprocess_exit(raise_on_timeout=raise_on_timeout)
+
+    def _check_subprocess_exit(self, raise_on_timeout: bool = False) -> int | None:
+        """Check if the subprocess has exited."""
+        if self._exit_code is None:
+            try:
+                self._exit_code = self._process.wait(timeout=0)
+                log.debug("Workload process exited", exit_code=self._exit_code)
+            except psutil.TimeoutExpired:
+                if raise_on_timeout:
+                    raise
+        return self._exit_code
+
+
+@attrs.define(kw_only=True)
+class ActivitySubprocess(WatchedSubprocess):
+    client: Client
+
+    _terminal_state: str | None = attrs.field(default=None, init=False)
+    _final_state: str | None = attrs.field(default=None, init=False)
+
+    _last_successful_heartbeat: float = attrs.field(default=0, init=False)
+    _last_heartbeat_attempt: float = attrs.field(default=0, init=False)
+
+    # After the failure of a heartbeat, we'll increment this counter. If it reaches `MAX_FAILED_HEARTBEATS`, we
+    # will kill the process. This is to handle temporary network issues etc. ensuring that the process
+    # does not hang around forever.
+    failed_heartbeats: int = attrs.field(default=0, init=False)
+
+    # Maximum possible time (in seconds) that task will have for execution of auxiliary processes
+    # like listeners after task is complete.
+    # TODO: This should come from airflow.cfg: [core] task_success_overtime
+    TASK_OVERTIME_THRESHOLD: ClassVar[float] = 20.0
+    _task_end_time_monotonic: float | None = attrs.field(default=None, init=False)
+
+    decoder: TypeAdapter[ToSupervisor] = TypeAdapter(ToSupervisor)
+
+    @classmethod
+    def start(  # type: ignore[override]
+        cls,
+        path: str | os.PathLike[str],
+        what: TaskInstance,
+        client: Client,
+        target: Callable[[], None] = _subprocess_main,
+        logger: FilteringBoundLogger | None = None,
+        **kwargs,
+    ) -> Self:
+        proc = super().start(id=what.id, client=client, target=target, logger=logger, **kwargs)
+        # Tell the task process what it needs to do!
+        proc._on_child_started(what, path)
+        return proc
+
+    def _on_child_started(self, ti: TaskInstance, path: str | os.PathLike[str]):
+        """Send startup message to the subprocess."""
+        try:
+            # We've forked, but the task won't start doing anything until we send it the StartupDetails
+            # message. But before we do that, we need to tell the server it's started (so it has the chance to
+            # tell us "no, stop!" for any reason)
+            ti_context = self.client.task_instances.start(ti.id, self.pid, datetime.now(tz=timezone.utc))
+            self._last_successful_heartbeat = time.monotonic()
+        except Exception:
+            # On any error kill that subprocess!
+            self.kill(signal.SIGKILL)
+            raise
+
+        msg = StartupDetails.model_construct(
+            ti=ti,
+            file=os.fspath(path),
+            requests_fd=self._requests_fd,
+            ti_context=ti_context,
+        )
+
+        # Send the message to tell the process what it needs to execute
+        log.debug("Sending", msg=msg)
+
+        try:
+            self.stdin.write(msg.model_dump_json().encode())
+            self.stdin.write(b"\n")
+        except BrokenPipeError:
+            # Debug is fine, the process will have shown _something_ in it's last_chance exception handler
+            log.debug("Couldn't send startup message to Subprocess - it died very early", pid=self.pid)
+
     def wait(self) -> int:
         if self._exit_code is not None:
             return self._exit_code
@@ -579,51 +672,6 @@ def _handle_process_overtime_if_needed(self):
             log.warning("Workload success overtime reached; terminating process", ti_id=self.id)
             self.kill(signal.SIGTERM, force=True)
 
-    def _service_subprocess(self, max_wait_time: float, raise_on_timeout: bool = False):
-        """
-        Service subprocess events by processing socket activity and checking for process exit.
-
-        This method:
-        - Waits for activity on the registered file objects (via `self.selector.select`).
-        - Processes any events triggered on these file objects.
-        - Checks if the subprocess has exited during the wait.
-
-        :param max_wait_time: Maximum time to block while waiting for events, in seconds.
-        :param raise_on_timeout: If True, raise an exception if the subprocess does not exit within the timeout.
-        :returns: The process exit code, or None if it's still alive
-        """
-        events = self.selector.select(timeout=max_wait_time)
-        for key, _ in events:
-            # Retrieve the handler responsible for processing this file object (e.g., stdout, stderr)
-            socket_handler = key.data
-
-            # Example of handler behavior:
-            # If the subprocess writes "Hello, World!" to stdout:
-            # - `socket_handler` reads and processes the message.
-            # - If EOF is reached, the handler returns False to signal no more reads are expected.
-            need_more = socket_handler(key.fileobj)
-
-            # If the handler signals that the file object is no longer needed (EOF, closed, etc.)
-            # unregister it from the selector to stop monitoring; `wait()` blocks until all selectors
-            # are removed.
-            if not need_more:
-                self.selector.unregister(key.fileobj)
-                key.fileobj.close()  # type: ignore[union-attr]
-
-        # Check if the subprocess has exited
-        return self._check_subprocess_exit(raise_on_timeout=raise_on_timeout)
-
-    def _check_subprocess_exit(self, raise_on_timeout: bool = False) -> int | None:
-        """Check if the subprocess has exited."""
-        if self._exit_code is None:
-            try:
-                self._exit_code = self._process.wait(timeout=0)
-                log.debug("Workload process exited", exit_code=self._exit_code)
-            except psutil.TimeoutExpired:
-                if raise_on_timeout:
-                    raise
-        return self._exit_code
-
     def _send_heartbeat_if_needed(self):
         """Send a heartbeat to the client if heartbeat interval has passed."""
         # Respect the minimum interval between heartbeat attempts
@@ -684,35 +732,6 @@ def final_state(self):
             return self._terminal_state or TerminalTIState.SUCCESS
         return TerminalTIState.FAILED
 
-    def __rich_repr__(self):
-        yield "id", self.id
-        yield "pid", self.pid
-        # only include this if it's not the default (third argument)
-        yield "exit_code", self._exit_code, None
-
-    __rich_repr__.angular = True  # type: ignore[attr-defined]
-
-    def __repr__(self) -> str:
-        rep = f"<WatchedSubprocess id={self.id} pid={self.pid}"
-        if self._exit_code is not None:
-            rep += f" exit_code={self._exit_code}"
-        return rep + " >"
-
-    def handle_requests(self, log: FilteringBoundLogger) -> Generator[None, bytes, None]:
-        """Handle incoming requests from the task process, respond with the appropriate data."""
-        decoder = TypeAdapter[ToSupervisor](ToSupervisor)
-
-        while True:
-            line = yield
-
-            try:
-                msg = decoder.validate_json(line)
-            except Exception:
-                log.exception("Unable to decode message", line=line)
-                continue
-
-            self._handle_request(msg, log)
-
     def _handle_request(self, msg: ToSupervisor, log: FilteringBoundLogger):
         log.debug("Received message from task runner", msg=msg)
         resp = None
@@ -902,7 +921,7 @@ def supervise(
         processors = logging_processors(enable_pretty_log=pretty_logs)[0]
         logger = structlog.wrap_logger(underlying_logger, processors=processors, logger_name="task").bind()
 
-    process = WatchedSubprocess.start(dag_path, ti, client=client, logger=logger)
+    process = ActivitySubprocess.start(dag_path, ti, client=client, logger=logger)
 
     exit_code = process.wait()
     end = time.monotonic()
diff --git a/task_sdk/tests/execution_time/test_supervisor.py b/task_sdk/tests/execution_time/test_supervisor.py
index 3ced432b2eea3..c5879971a63d4 100644
--- a/task_sdk/tests/execution_time/test_supervisor.py
+++ b/task_sdk/tests/execution_time/test_supervisor.py
@@ -52,7 +52,7 @@
     VariableResult,
     XComResult,
 )
-from airflow.sdk.execution_time.supervisor import WatchedSubprocess, supervise
+from airflow.sdk.execution_time.supervisor import ActivitySubprocess, supervise
 from airflow.sdk.execution_time.task_runner import CommsDecoder
 from airflow.utils import timezone, timezone as tz
 
@@ -99,7 +99,7 @@ def subprocess_main():
         instant = tz.datetime(2024, 11, 7, 12, 34, 56, 78901)
         time_machine.move_to(instant, tick=False)
 
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(
                 id="4d828a62-a417-4936-a7a6-2b3fabacecab",
@@ -166,7 +166,7 @@ def subprocess_main():
             assert os.getpid() != main_pid
             os.kill(os.getpid(), signal.SIGKILL)
 
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(
                 id="4d828a62-a417-4936-a7a6-2b3fabacecab",
@@ -189,7 +189,7 @@ def subprocess_main():
             # or import error for instance - a very early exception
             raise RuntimeError("Fake syntax error")
 
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(
                 id=uuid7(),
@@ -225,7 +225,7 @@ def subprocess_main():
 
         ti_id = uuid7()
         spy = spy_agency.spy_on(sdk_client.TaskInstanceOperations.heartbeat)
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(
                 id=ti_id,
@@ -341,7 +341,7 @@ def handle_request(request: httpx.Request) -> httpx.Response:
         client = make_client(transport=httpx.MockTransport(handle_request))
 
         with pytest.raises(ServerResponseError, match="Server returned error") as err:
-            WatchedSubprocess.start(path=os.devnull, what=ti, client=client)
+            ActivitySubprocess.start(path=os.devnull, what=ti, client=client)
 
         assert err.value.response.status_code == 409
         assert err.value.detail == {
@@ -394,7 +394,7 @@ def handle_request(request: httpx.Request) -> httpx.Response:
             # Return a 204 for all other requests
             return httpx.Response(status_code=204)
 
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(id=ti_id, task_id="b", dag_id="c", run_id="d", try_number=1),
             client=make_client(transport=httpx.MockTransport(handle_request)),
@@ -447,12 +447,13 @@ def test_heartbeat_failures_handling(self, monkeypatch, mocker, captured_logs, t
         # Patch the kill method at the class level so we can assert it was called with the correct signal
         mock_kill = mocker.patch("airflow.sdk.execution_time.supervisor.WatchedSubprocess.kill")
 
-        proc = WatchedSubprocess(
+        proc = ActivitySubprocess(
             id=TI_ID,
             pid=mock_process.pid,
             stdin=mocker.MagicMock(),
             client=client,
             process=mock_process,
+            requests_fd=-1,
         )
 
         time_now = tz.datetime(2024, 11, 28, 12, 0, 0)
@@ -533,14 +534,15 @@ def test_overtime_handling(
         mocker.patch("time.monotonic", return_value=20.0)
 
         # Patch the task overtime threshold
-        monkeypatch.setattr(WatchedSubprocess, "TASK_OVERTIME_THRESHOLD", overtime_threshold)
+        monkeypatch.setattr(ActivitySubprocess, "TASK_OVERTIME_THRESHOLD", overtime_threshold)
 
-        mock_watched_subprocess = WatchedSubprocess(
+        mock_watched_subprocess = ActivitySubprocess(
             id=TI_ID,
             pid=12345,
             stdin=mocker.Mock(),
             process=mocker.Mock(),
             client=mocker.Mock(),
+            requests_fd=-1,
         )
 
         # Set the terminal state and task end datetime
@@ -572,12 +574,13 @@ def mock_process(self, mocker):
 
     @pytest.fixture
     def watched_subprocess(self, mocker, mock_process):
-        proc = WatchedSubprocess(
+        proc = ActivitySubprocess(
             id=TI_ID,
             pid=12345,
             stdin=mocker.Mock(),
             client=mocker.Mock(),
             process=mock_process,
+            requests_fd=-1,
         )
         # Mock the selector
         mock_selector = mocker.Mock(spec=selectors.DefaultSelector)
@@ -662,7 +665,7 @@ def _handler(sig, frame):
 
         ti_id = uuid7()
 
-        proc = WatchedSubprocess.start(
+        proc = ActivitySubprocess.start(
             path=os.devnull,
             what=TaskInstance(id=ti_id, task_id="b", dag_id="c", run_id="d", try_number=1),
             client=MagicMock(spec=sdk_client.Client),
@@ -753,12 +756,13 @@ class TestHandleRequest:
     @pytest.fixture
     def watched_subprocess(self, mocker):
         """Fixture to provide a WatchedSubprocess instance."""
-        return WatchedSubprocess(
+        return ActivitySubprocess(
             id=TI_ID,
             pid=12345,
             stdin=BytesIO(),
             client=mocker.Mock(),
             process=mocker.Mock(),
+            requests_fd=-1,
         )
 
     @pytest.mark.parametrize(
diff --git a/tests/dag_processing/test_manager.py b/tests/dag_processing/test_manager.py
index 2cc8a43e05450..12b9cd52013bc 100644
--- a/tests/dag_processing/test_manager.py
+++ b/tests/dag_processing/test_manager.py
@@ -112,8 +112,8 @@ def mock_processor(self) -> DagFileProcessorProcess:
             id=uuid7(),
             pid=1234,
             process=proc,
-            client=Mock(),
             stdin=io.BytesIO(),
+            requests_fd=123,
         )
         ret._num_open_sockets = 0
         return ret
@@ -435,12 +435,11 @@ def test_kill_timed_out_processors_no_kill(self):
         mock_kill.assert_not_called()
 
     @pytest.mark.parametrize(
-        ["callbacks", "path", "child_comms_fd", "expected_buffer"],
+        ["callbacks", "path", "expected_buffer"],
         [
             pytest.param(
                 [],
                 "/opt/airflow/dags/test_dag.py",
-                123,
                 b'{"file":"/opt/airflow/dags/test_dag.py","requests_fd":123,"callback_requests":[],'
                 b'"type":"DagFileParseRequest"}\n',
             ),
@@ -454,7 +453,6 @@ def test_kill_timed_out_processors_no_kill(self):
                     )
                 ],
                 "/opt/airflow/dags/dag_callback_dag.py",
-                123,
                 b'{"file":"/opt/airflow/dags/dag_callback_dag.py","requests_fd":123,"callback_requests":'
                 b'[{"full_filepath":"/opt/airflow/dags/dag_callback_dag.py","msg":null,"dag_id":"dag_id",'
                 b'"run_id":"run_id","is_failure_callback":false,"type":"DagCallbackRequest"}],'
@@ -462,9 +460,9 @@ def test_kill_timed_out_processors_no_kill(self):
             ),
         ],
     )
-    def test_serialize_callback_requests(self, callbacks, path, child_comms_fd, expected_buffer):
+    def test_serialize_callback_requests(self, callbacks, path, expected_buffer):
         processor = self.mock_processor()
-        processor._on_child_started(callbacks, path, child_comms_fd)
+        processor._on_child_started(callbacks, path)
 
         # Verify the response was added to the buffer
         val = processor.stdin.getvalue()

From 4c01f7d16be11eafc0df9b1acf3c0af4af569611 Mon Sep 17 00:00:00 2001
From: Ash Berlin-Taylor <ash@apache.org>
Date: Fri, 10 Jan 2025 23:16:33 +0000
Subject: [PATCH 18/24] Fix tests introduced in #45546 (#45572)

This was merged without letting tests pass somehow. We have removed the
`root_dag` argument in Airflow 3.
---
 tests/api_connexion/endpoints/test_dag_run_endpoint.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/api_connexion/endpoints/test_dag_run_endpoint.py b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
index 4a0d18ff48cf9..caa061158f577 100644
--- a/tests/api_connexion/endpoints/test_dag_run_endpoint.py
+++ b/tests/api_connexion/endpoints/test_dag_run_endpoint.py
@@ -1531,7 +1531,7 @@ def test_action_logging(self, state, run_type, dag_maker, session):
         dag_run_id = "TEST_DAG_RUN_ID"
         with dag_maker(dag_id) as dag:
             task = EmptyOperator(task_id="task_id", dag=dag)
-        self.app.dag_bag.bag_dag(dag, root_dag=dag)
+        self.app.dag_bag.bag_dag(dag)
         dr = dag_maker.create_dagrun(run_id=dag_run_id, run_type=run_type)
         ti = dr.get_task_instance(task_id="task_id")
         ti.task = task

From 662804921feb2c9539c882914a4134bf773c0e3e Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Sat, 11 Jan 2025 07:50:30 +0100
Subject: [PATCH 19/24] Add optional --image-file-dir to store loaded files
 elsewhere (#45564)

While backorting the "pull_request_target" removal to v2-10-test
branches it turned out that there is not enough disk space
on Public runner to load all 5 images and keep the file dump at
the same time in the same filesystem. This PR allows to choose
where the load/save files will be stored and in the github
runner environment we store the files in "/mnt" wnich is a separate
folder with 40GB free.
---
 .../prepare_breeze_and_image/action.yml       | 11 ++-
 .../prepare_single_ci_image/action.yml        | 10 ++-
 .github/workflows/ci-image-build.yml          | 10 ++-
 .github/workflows/prod-image-build.yml        | 10 ++-
 .../doc/images/output_ci-image_load.svg       | 60 ++++++++++------
 .../doc/images/output_ci-image_load.txt       |  2 +-
 .../doc/images/output_ci-image_save.svg       | 26 ++++---
 .../doc/images/output_ci-image_save.txt       |  2 +-
 .../doc/images/output_prod-image_load.svg     | 50 ++++++++------
 .../doc/images/output_prod-image_load.txt     |  2 +-
 .../doc/images/output_prod-image_save.svg     | 26 ++++---
 .../doc/images/output_prod-image_save.txt     |  2 +-
 .../commands/ci_image_commands.py             | 68 ++++++++++++-------
 .../commands/ci_image_commands_config.py      |  2 +
 .../commands/common_image_options.py          | 19 ++++++
 .../commands/production_image_commands.py     | 60 ++++++++++------
 .../production_image_commands_config.py       |  2 +
 dev/breeze/src/airflow_breeze/utils/github.py |  4 +-
 18 files changed, 246 insertions(+), 120 deletions(-)

diff --git a/.github/actions/prepare_breeze_and_image/action.yml b/.github/actions/prepare_breeze_and_image/action.yml
index e6755444b2f4f..26be0b76315ff 100644
--- a/.github/actions/prepare_breeze_and_image/action.yml
+++ b/.github/actions/prepare_breeze_and_image/action.yml
@@ -46,17 +46,22 @@ runs:
       with:
         use-uv: ${{ inputs.use-uv }}
       id: breeze
+    - name: Check free space
+      run: df -H
+      shell: bash
+    - name: Make /mnt/ directory writeable
+      run: sudo chown -R ${USER} /mnt
+      shell: bash
     - name: "Restore ${{ inputs.image-type }} docker image ${{ inputs.platform }}:${{ inputs.python }}"
       uses: apache/infrastructure-actions/stash/restore@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
       with:
         key: ${{ inputs.image-type }}-image-save-${{ inputs.platform }}-${{ inputs.python }}
-        path: "/tmp/"
+        path: "/mnt/"
     - name: "Load ${{ inputs.image-type }} image ${{ inputs.platform }}:${{ inputs.python }}"
       env:
         PLATFORM: ${{ inputs.platform }}
         PYTHON: ${{ inputs.python }}
         IMAGE_TYPE: ${{ inputs.image-type }}
       run: >
-        breeze ${IMAGE_TYPE}-image load
-        --platform ${PLATFORM} --python ${PYTHON}
+        breeze ${IMAGE_TYPE}-image load --platform "${PLATFORM}" --python "${PYTHON}" --image-file-dir "/mnt"
       shell: bash
diff --git a/.github/actions/prepare_single_ci_image/action.yml b/.github/actions/prepare_single_ci_image/action.yml
index 3dde30033aa15..ecae9f802c966 100644
--- a/.github/actions/prepare_single_ci_image/action.yml
+++ b/.github/actions/prepare_single_ci_image/action.yml
@@ -35,16 +35,22 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Check free space
+      run: df -H
+      shell: bash
+    - name: Make /mnt/ directory writeable
+      run: sudo chown -R ${USER} /mnt
+      shell: bash
     - name: "Restore CI docker images ${{ inputs.platform }}:${{ inputs.python }}"
       uses: apache/infrastructure-actions/stash/restore@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
       with:
         key: ci-image-save-${{ inputs.platform }}-${{ inputs.python }}
-        path: "/tmp/"
+        path: "/mnt/"
       if: contains(inputs.python-versions-list-as-string, inputs.python)
     - name: "Load CI image ${{ inputs.platform }}:${{ inputs.python }}"
       env:
         PLATFORM: ${{ inputs.platform }}
         PYTHON: ${{ inputs.python }}
-      run: breeze ci-image load --platform "${PLATFORM}" --python "${PYTHON}"
+      run: breeze ci-image load --platform "${PLATFORM}" --python "${PYTHON}" --image-file-dir "/mnt/"
       shell: bash
       if: contains(inputs.python-versions-list-as-string, inputs.python)
diff --git a/.github/workflows/ci-image-build.yml b/.github/workflows/ci-image-build.yml
index 55bf4e046e23f..9283dc06b936f 100644
--- a/.github/workflows/ci-image-build.yml
+++ b/.github/workflows/ci-image-build.yml
@@ -175,16 +175,22 @@ jobs:
           PUSH: ${{ inputs.push-image }}
           VERBOSE: "true"
           PLATFORM: ${{ inputs.platform }}
+      - name: Check free space
+        run: df -H
+        shell: bash
+      - name: Make /mnt/ directory writeable
+        run: sudo chown -R ${USER} /mnt
+        shell: bash
       - name: "Export CI docker image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
         env:
           PLATFORM: ${{ inputs.platform }}
-        run: breeze ci-image save --platform "${PLATFORM}"
+        run: breeze ci-image save --platform "${PLATFORM}" --image-file-dir "/mnt"
         if: inputs.upload-image-artifact == 'true'
       - name: "Stash CI docker image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
         uses: apache/infrastructure-actions/stash/save@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
         with:
           key: ci-image-save-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}
-          path: "/tmp/ci-image-save-*-${{ env.PYTHON_MAJOR_MINOR_VERSION }}.tar"
+          path: "/mnt/ci-image-save-*-${{ env.PYTHON_MAJOR_MINOR_VERSION }}.tar"
           if-no-files-found: 'error'
           retention-days: '2'
         if: inputs.upload-image-artifact == 'true'
diff --git a/.github/workflows/prod-image-build.yml b/.github/workflows/prod-image-build.yml
index 85b421cade447..5784c7c58ba60 100644
--- a/.github/workflows/prod-image-build.yml
+++ b/.github/workflows/prod-image-build.yml
@@ -283,17 +283,23 @@ jobs:
         if: inputs.build-provider-packages != 'true'
       - name: "Verify PROD image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
         run: breeze prod-image verify
+      - name: Check free space
+        run: df -H
+        shell: bash
+      - name: Make /mnt/ directory writeable
+        run: sudo chown -R ${USER} /mnt
+        shell: bash
       - name: "Export PROD docker image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
         env:
           PLATFORM: ${{ inputs.platform }}
         run: >
-          breeze prod-image save --platform "${PLATFORM}"
+          breeze prod-image save --platform "${PLATFORM}" --image-file-dir "/mnt"
         if: inputs.upload-image-artifact == 'true'
       - name: "Stash PROD docker image ${{ env.PYTHON_MAJOR_MINOR_VERSION }}"
         uses: apache/infrastructure-actions/stash/save@c94b890bbedc2fc61466d28e6bd9966bc6c6643c
         with:
           key: prod-image-save-${{ inputs.platform }}-${{ env.PYTHON_MAJOR_MINOR_VERSION }}
-          path: "/tmp/prod-image-save-*-${{ env.PYTHON_MAJOR_MINOR_VERSION }}.tar"
+          path: "/mnt/prod-image-save-*-${{ env.PYTHON_MAJOR_MINOR_VERSION }}.tar"
           if-no-files-found: 'error'
           retention-days: '2'
         if: inputs.upload-image-artifact == 'true'
diff --git a/dev/breeze/doc/images/output_ci-image_load.svg b/dev/breeze/doc/images/output_ci-image_load.svg
index 962b9cb52c9ed..cb7036af1c946 100644
--- a/dev/breeze/doc/images/output_ci-image_load.svg
+++ b/dev/breeze/doc/images/output_ci-image_load.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 782.0" xmlns="http://www.w3.org/2000/svg">
+<svg class="rich-terminal" viewBox="0 0 1482 904.0" xmlns="http://www.w3.org/2000/svg">
     <!-- Generated with Rich https://www.textualize.io -->
     <style>
 
@@ -45,7 +45,7 @@
 
     <defs>
     <clipPath id="breeze-ci-image-load-clip-terminal">
-      <rect x="0" y="0" width="1463.0" height="731.0" />
+      <rect x="0" y="0" width="1463.0" height="853.0" />
     </clipPath>
     <clipPath id="breeze-ci-image-load-line-0">
     <rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -134,9 +134,24 @@
 <clipPath id="breeze-ci-image-load-line-28">
     <rect x="0" y="684.7" width="1464" height="24.65"/>
             </clipPath>
+<clipPath id="breeze-ci-image-load-line-29">
+    <rect x="0" y="709.1" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-ci-image-load-line-30">
+    <rect x="0" y="733.5" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-ci-image-load-line-31">
+    <rect x="0" y="757.9" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-ci-image-load-line-32">
+    <rect x="0" y="782.3" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-ci-image-load-line-33">
+    <rect x="0" y="806.7" width="1464" height="24.65"/>
+            </clipPath>
     </defs>
 
-    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="780" rx="8"/><text class="breeze-ci-image-load-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;ci-image&#160;load</text>
+    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="902" rx="8"/><text class="breeze-ci-image-load-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;ci-image&#160;load</text>
             <g transform="translate(26,22)">
             <circle cx="0" cy="0" r="7" fill="#ff5f57"/>
             <circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -158,24 +173,29 @@
 </text><text class="breeze-ci-image-load-r5" x="0" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-9)">│</text><text class="breeze-ci-image-load-r4" x="61" y="239.6" textLength="122" clip-path="url(#breeze-ci-image-load-line-9)">--platform</text><text class="breeze-ci-image-load-r1" x="451.4" y="239.6" textLength="329.4" clip-path="url(#breeze-ci-image-load-line-9)">Platform&#160;for&#160;Airflow&#160;image.</text><text class="breeze-ci-image-load-r7" x="793" y="239.6" textLength="329.4" clip-path="url(#breeze-ci-image-load-line-9)">(linux/amd64&#160;|&#160;linux/arm64)</text><text class="breeze-ci-image-load-r5" x="1451.8" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-9)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-9)">
 </text><text class="breeze-ci-image-load-r5" x="0" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-10)">│</text><text class="breeze-ci-image-load-r4" x="61" y="264" textLength="146.4" clip-path="url(#breeze-ci-image-load-line-10)">--image-file</text><text class="breeze-ci-image-load-r1" x="451.4" y="264" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-10)">Optional&#160;file&#160;name&#160;to&#160;load&#160;the&#160;image&#160;from&#160;-&#160;name&#160;must&#160;follow&#160;the&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-10)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-10)">
 </text><text class="breeze-ci-image-load-r5" x="0" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-11)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="288.4" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-11)">convention:`ci-image-save-{escaped_platform}-*-{python_version}.tar`.&#160;where&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-11)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-11)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="312.8" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-12)">escaped_platform&#160;is&#160;one&#160;of&#160;linux_amd64&#160;or&#160;linux_arm64.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="337.2" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-13)">(FILE)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">│</text><text class="breeze-ci-image-load-r4" x="61" y="361.6" textLength="231.8" clip-path="url(#breeze-ci-image-load-line-14)">--github-repository</text><text class="breeze-ci-image-load-r6" x="402.6" y="361.6" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-14)">-g</text><text class="breeze-ci-image-load-r1" x="451.4" y="361.6" textLength="585.6" clip-path="url(#breeze-ci-image-load-line-14)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-ci-image-load-r7" x="1049.2" y="361.6" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-14)">(TEXT)</text><text class="breeze-ci-image-load-r5" x="1134.6" y="361.6" textLength="305" clip-path="url(#breeze-ci-image-load-line-14)">[default:&#160;apache/airflow]</text><text class="breeze-ci-image-load-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">│</text><text class="breeze-ci-image-load-r8" x="24.4" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">*</text><text class="breeze-ci-image-load-r4" x="61" y="386" textLength="170.8" clip-path="url(#breeze-ci-image-load-line-15)">--github-token</text><text class="breeze-ci-image-load-r1" x="451.4" y="386" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-15)">The&#160;token&#160;used&#160;to&#160;authenticate&#160;to&#160;GitHub.&#160;You&#160;can&#160;generate&#160;it&#160;with&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="410.4" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-16)">https://github.com/settings/tokens/new?description=Read%20repo&amp;scopes=public_repo</text><text class="breeze-ci-image-load-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="434.8" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-17)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">│</text><text class="breeze-ci-image-load-r9" x="451.4" y="459.2" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-18)">[required]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">│</text><text class="breeze-ci-image-load-r4" x="61" y="483.6" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-19)">--from-pr</text><text class="breeze-ci-image-load-r1" x="451.4" y="483.6" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-19)">Optional&#160;pr&#160;number&#160;of&#160;the&#160;github&#160;action&#160;job&#160;to&#160;load&#160;the&#160;image&#160;from.&#160;loads&#160;the&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="508" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-20)">image&#160;from&#160;the&#160;latest&#160;job.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="532.4" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-21)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">│</text><text class="breeze-ci-image-load-r4" x="61" y="556.8" textLength="122" clip-path="url(#breeze-ci-image-load-line-22)">--from-run</text><text class="breeze-ci-image-load-r1" x="451.4" y="556.8" textLength="780.8" clip-path="url(#breeze-ci-image-load-line-22)">Optional&#160;run&#160;id&#160;of&#160;the&#160;github&#160;action&#160;run&#160;to&#160;load&#160;the&#160;image&#160;from.</text><text class="breeze-ci-image-load-r7" x="1244.4" y="556.8" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-22)">(TEXT)</text><text class="breeze-ci-image-load-r5" x="1451.8" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">│</text><text class="breeze-ci-image-load-r4" x="61" y="581.2" textLength="317.2" clip-path="url(#breeze-ci-image-load-line-23)">--skip-image-file-deletion</text><text class="breeze-ci-image-load-r1" x="451.4" y="581.2" textLength="414.8" clip-path="url(#breeze-ci-image-load-line-23)">Skip&#160;image&#160;deletion&#160;after&#160;loading.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="605.6" textLength="1464" clip-path="url(#breeze-ci-image-load-line-24)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-load-r1" x="1464" y="605.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-24)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="630" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-25)">╭─</text><text class="breeze-ci-image-load-r5" x="24.4" y="630" textLength="195.2" clip-path="url(#breeze-ci-image-load-line-25)">&#160;Common&#160;options&#160;</text><text class="breeze-ci-image-load-r5" x="219.6" y="630" textLength="1220" clip-path="url(#breeze-ci-image-load-line-25)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-ci-image-load-r5" x="1439.6" y="630" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-25)">─╮</text><text class="breeze-ci-image-load-r1" x="1464" y="630" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-25)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="654.4" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-26)">--dry-run</text><text class="breeze-ci-image-load-r6" x="158.6" y="654.4" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-26)">-D</text><text class="breeze-ci-image-load-r1" x="207.4" y="654.4" textLength="719.8" clip-path="url(#breeze-ci-image-load-line-26)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="678.8" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-27)">--verbose</text><text class="breeze-ci-image-load-r6" x="158.6" y="678.8" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-27)">-v</text><text class="breeze-ci-image-load-r1" x="207.4" y="678.8" textLength="585.6" clip-path="url(#breeze-ci-image-load-line-27)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">
-</text><text class="breeze-ci-image-load-r5" x="0" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="703.2" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-28)">--help</text><text class="breeze-ci-image-load-r6" x="158.6" y="703.2" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-28)">-h</text><text class="breeze-ci-image-load-r1" x="207.4" y="703.2" textLength="329.4" clip-path="url(#breeze-ci-image-load-line-28)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="312.8" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-12)">escaped_platform&#160;is&#160;one&#160;of&#160;linux_amd64&#160;or&#160;linux_arm64.&#160;If&#160;it&#160;does&#160;not&#160;exist&#160;in&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-12)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="337.2" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-13)">current&#160;working&#160;dir&#160;and&#160;if&#160;you&#160;do&#160;not&#160;specify&#160;absolute&#160;file,&#160;it&#160;will&#160;be&#160;searched&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-13)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="361.6" textLength="134.2" clip-path="url(#breeze-ci-image-load-line-14)">for&#160;in&#160;the&#160;</text><text class="breeze-ci-image-load-r4" x="585.6" y="361.6" textLength="195.2" clip-path="url(#breeze-ci-image-load-line-14)">--image-file-dir</text><text class="breeze-ci-image-load-r1" x="780.8" y="361.6" textLength="658.8" clip-path="url(#breeze-ci-image-load-line-14)">.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-14)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="386" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-15)">(FILE)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-15)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">│</text><text class="breeze-ci-image-load-r4" x="61" y="410.4" textLength="195.2" clip-path="url(#breeze-ci-image-load-line-16)">--image-file-dir</text><text class="breeze-ci-image-load-r1" x="451.4" y="410.4" textLength="854" clip-path="url(#breeze-ci-image-load-line-16)">The&#160;path&#160;to&#160;the&#160;directory&#160;where&#160;the&#160;image&#160;files&#160;are&#160;stored&#160;by&#160;default.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-16)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="434.8" textLength="854" clip-path="url(#breeze-ci-image-load-line-17)">(DIRECTORY)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-17)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">│</text><text class="breeze-ci-image-load-r5" x="451.4" y="459.2" textLength="854" clip-path="url(#breeze-ci-image-load-line-18)">[default:&#160;/tmp]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-18)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">│</text><text class="breeze-ci-image-load-r4" x="61" y="483.6" textLength="231.8" clip-path="url(#breeze-ci-image-load-line-19)">--github-repository</text><text class="breeze-ci-image-load-r6" x="402.6" y="483.6" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-19)">-g</text><text class="breeze-ci-image-load-r1" x="451.4" y="483.6" textLength="585.6" clip-path="url(#breeze-ci-image-load-line-19)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-ci-image-load-r7" x="1049.2" y="483.6" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-19)">(TEXT)</text><text class="breeze-ci-image-load-r5" x="1134.6" y="483.6" textLength="305" clip-path="url(#breeze-ci-image-load-line-19)">[default:&#160;apache/airflow]</text><text class="breeze-ci-image-load-r5" x="1451.8" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="483.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-19)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">│</text><text class="breeze-ci-image-load-r8" x="24.4" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">*</text><text class="breeze-ci-image-load-r4" x="61" y="508" textLength="170.8" clip-path="url(#breeze-ci-image-load-line-20)">--github-token</text><text class="breeze-ci-image-load-r1" x="451.4" y="508" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-20)">The&#160;token&#160;used&#160;to&#160;authenticate&#160;to&#160;GitHub.&#160;You&#160;can&#160;generate&#160;it&#160;with&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="508" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-20)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="532.4" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-21)">https://github.com/settings/tokens/new?description=Read%20repo&amp;scopes=public_repo</text><text class="breeze-ci-image-load-r5" x="1451.8" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="532.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-21)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="556.8" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-22)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="556.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-22)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">│</text><text class="breeze-ci-image-load-r9" x="451.4" y="581.2" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-23)">[required]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="581.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-23)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="605.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-24)">│</text><text class="breeze-ci-image-load-r4" x="61" y="605.6" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-24)">--from-pr</text><text class="breeze-ci-image-load-r1" x="451.4" y="605.6" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-24)">Optional&#160;pr&#160;number&#160;of&#160;the&#160;github&#160;action&#160;job&#160;to&#160;load&#160;the&#160;image&#160;from.&#160;loads&#160;the&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="605.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-24)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="605.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-24)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="630" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-25)">│</text><text class="breeze-ci-image-load-r1" x="451.4" y="630" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-25)">image&#160;from&#160;the&#160;latest&#160;job.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="630" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-25)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="630" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-25)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">│</text><text class="breeze-ci-image-load-r7" x="451.4" y="654.4" textLength="988.2" clip-path="url(#breeze-ci-image-load-line-26)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-load-r5" x="1451.8" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="654.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-26)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">│</text><text class="breeze-ci-image-load-r4" x="61" y="678.8" textLength="122" clip-path="url(#breeze-ci-image-load-line-27)">--from-run</text><text class="breeze-ci-image-load-r1" x="451.4" y="678.8" textLength="780.8" clip-path="url(#breeze-ci-image-load-line-27)">Optional&#160;run&#160;id&#160;of&#160;the&#160;github&#160;action&#160;run&#160;to&#160;load&#160;the&#160;image&#160;from.</text><text class="breeze-ci-image-load-r7" x="1244.4" y="678.8" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-27)">(TEXT)</text><text class="breeze-ci-image-load-r5" x="1451.8" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="678.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-27)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">│</text><text class="breeze-ci-image-load-r4" x="61" y="703.2" textLength="317.2" clip-path="url(#breeze-ci-image-load-line-28)">--skip-image-file-deletion</text><text class="breeze-ci-image-load-r1" x="451.4" y="703.2" textLength="414.8" clip-path="url(#breeze-ci-image-load-line-28)">Skip&#160;image&#160;deletion&#160;after&#160;loading.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="703.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-28)">
 </text><text class="breeze-ci-image-load-r5" x="0" y="727.6" textLength="1464" clip-path="url(#breeze-ci-image-load-line-29)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-load-r1" x="1464" y="727.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-29)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="752" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-30)">╭─</text><text class="breeze-ci-image-load-r5" x="24.4" y="752" textLength="195.2" clip-path="url(#breeze-ci-image-load-line-30)">&#160;Common&#160;options&#160;</text><text class="breeze-ci-image-load-r5" x="219.6" y="752" textLength="1220" clip-path="url(#breeze-ci-image-load-line-30)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-ci-image-load-r5" x="1439.6" y="752" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-30)">─╮</text><text class="breeze-ci-image-load-r1" x="1464" y="752" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-30)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="776.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-31)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="776.4" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-31)">--dry-run</text><text class="breeze-ci-image-load-r6" x="158.6" y="776.4" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-31)">-D</text><text class="breeze-ci-image-load-r1" x="207.4" y="776.4" textLength="719.8" clip-path="url(#breeze-ci-image-load-line-31)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="776.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-31)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="776.4" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-31)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="800.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-32)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="800.8" textLength="109.8" clip-path="url(#breeze-ci-image-load-line-32)">--verbose</text><text class="breeze-ci-image-load-r6" x="158.6" y="800.8" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-32)">-v</text><text class="breeze-ci-image-load-r1" x="207.4" y="800.8" textLength="585.6" clip-path="url(#breeze-ci-image-load-line-32)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="800.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-32)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="800.8" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-32)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="825.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-33)">│</text><text class="breeze-ci-image-load-r4" x="24.4" y="825.2" textLength="73.2" clip-path="url(#breeze-ci-image-load-line-33)">--help</text><text class="breeze-ci-image-load-r6" x="158.6" y="825.2" textLength="24.4" clip-path="url(#breeze-ci-image-load-line-33)">-h</text><text class="breeze-ci-image-load-r1" x="207.4" y="825.2" textLength="329.4" clip-path="url(#breeze-ci-image-load-line-33)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-ci-image-load-r5" x="1451.8" y="825.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-33)">│</text><text class="breeze-ci-image-load-r1" x="1464" y="825.2" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-33)">
+</text><text class="breeze-ci-image-load-r5" x="0" y="849.6" textLength="1464" clip-path="url(#breeze-ci-image-load-line-34)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-load-r1" x="1464" y="849.6" textLength="12.2" clip-path="url(#breeze-ci-image-load-line-34)">
 </text>
     </g>
     </g>
diff --git a/dev/breeze/doc/images/output_ci-image_load.txt b/dev/breeze/doc/images/output_ci-image_load.txt
index 98c197b6f7bcb..9ab6e91ff9d6f 100644
--- a/dev/breeze/doc/images/output_ci-image_load.txt
+++ b/dev/breeze/doc/images/output_ci-image_load.txt
@@ -1 +1 @@
-4cf43760d7f83a9ffeea8af85e6e5426
+c7792f39775f01082f867e0ce0f38ecb
diff --git a/dev/breeze/doc/images/output_ci-image_save.svg b/dev/breeze/doc/images/output_ci-image_save.svg
index 393399e7a2645..6c4196005c7c8 100644
--- a/dev/breeze/doc/images/output_ci-image_save.svg
+++ b/dev/breeze/doc/images/output_ci-image_save.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 464.79999999999995" xmlns="http://www.w3.org/2000/svg">
+<svg class="rich-terminal" viewBox="0 0 1482 513.5999999999999" xmlns="http://www.w3.org/2000/svg">
     <!-- Generated with Rich https://www.textualize.io -->
     <style>
 
@@ -43,7 +43,7 @@
 
     <defs>
     <clipPath id="breeze-ci-image-save-clip-terminal">
-      <rect x="0" y="0" width="1463.0" height="413.79999999999995" />
+      <rect x="0" y="0" width="1463.0" height="462.59999999999997" />
     </clipPath>
     <clipPath id="breeze-ci-image-save-line-0">
     <rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -93,9 +93,15 @@
 <clipPath id="breeze-ci-image-save-line-15">
     <rect x="0" y="367.5" width="1464" height="24.65"/>
             </clipPath>
+<clipPath id="breeze-ci-image-save-line-16">
+    <rect x="0" y="391.9" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-ci-image-save-line-17">
+    <rect x="0" y="416.3" width="1464" height="24.65"/>
+            </clipPath>
     </defs>
 
-    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="462.8" rx="8"/><text class="breeze-ci-image-save-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;ci-image&#160;save</text>
+    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="511.6" rx="8"/><text class="breeze-ci-image-save-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;ci-image&#160;save</text>
             <g transform="translate(26,22)">
             <circle cx="0" cy="0" r="7" fill="#ff5f57"/>
             <circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -116,12 +122,14 @@
 </text><text class="breeze-ci-image-save-r5" x="0" y="215.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-8)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="215.2" textLength="122" clip-path="url(#breeze-ci-image-save-line-8)">--platform</text><text class="breeze-ci-image-save-r1" x="329.4" y="215.2" textLength="329.4" clip-path="url(#breeze-ci-image-save-line-8)">Platform&#160;for&#160;Airflow&#160;image.</text><text class="breeze-ci-image-save-r7" x="671" y="215.2" textLength="329.4" clip-path="url(#breeze-ci-image-save-line-8)">(linux/amd64&#160;|&#160;linux/arm64)</text><text class="breeze-ci-image-save-r5" x="1451.8" y="215.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-8)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="215.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-8)">
 </text><text class="breeze-ci-image-save-r5" x="0" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-9)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="239.6" textLength="231.8" clip-path="url(#breeze-ci-image-save-line-9)">--github-repository</text><text class="breeze-ci-image-save-r6" x="280.6" y="239.6" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-9)">-g</text><text class="breeze-ci-image-save-r1" x="329.4" y="239.6" textLength="585.6" clip-path="url(#breeze-ci-image-save-line-9)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-ci-image-save-r7" x="927.2" y="239.6" textLength="73.2" clip-path="url(#breeze-ci-image-save-line-9)">(TEXT)</text><text class="breeze-ci-image-save-r5" x="1012.6" y="239.6" textLength="305" clip-path="url(#breeze-ci-image-save-line-9)">[default:&#160;apache/airflow]</text><text class="breeze-ci-image-save-r5" x="1451.8" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-9)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="239.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-9)">
 </text><text class="breeze-ci-image-save-r5" x="0" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-10)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="264" textLength="146.4" clip-path="url(#breeze-ci-image-save-line-10)">--image-file</text><text class="breeze-ci-image-save-r1" x="329.4" y="264" textLength="427" clip-path="url(#breeze-ci-image-save-line-10)">Optional&#160;file&#160;to&#160;save&#160;the&#160;image&#160;to.</text><text class="breeze-ci-image-save-r7" x="768.6" y="264" textLength="73.2" clip-path="url(#breeze-ci-image-save-line-10)">(FILE)</text><text class="breeze-ci-image-save-r5" x="1451.8" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-10)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="264" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-10)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="288.4" textLength="1464" clip-path="url(#breeze-ci-image-save-line-11)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-save-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-11)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="312.8" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-12)">╭─</text><text class="breeze-ci-image-save-r5" x="24.4" y="312.8" textLength="195.2" clip-path="url(#breeze-ci-image-save-line-12)">&#160;Common&#160;options&#160;</text><text class="breeze-ci-image-save-r5" x="219.6" y="312.8" textLength="1220" clip-path="url(#breeze-ci-image-save-line-12)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-ci-image-save-r5" x="1439.6" y="312.8" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-12)">─╮</text><text class="breeze-ci-image-save-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-12)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-13)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="337.2" textLength="109.8" clip-path="url(#breeze-ci-image-save-line-13)">--verbose</text><text class="breeze-ci-image-save-r6" x="158.6" y="337.2" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-13)">-v</text><text class="breeze-ci-image-save-r1" x="207.4" y="337.2" textLength="585.6" clip-path="url(#breeze-ci-image-save-line-13)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-13)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-13)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-14)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="361.6" textLength="109.8" clip-path="url(#breeze-ci-image-save-line-14)">--dry-run</text><text class="breeze-ci-image-save-r6" x="158.6" y="361.6" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-14)">-D</text><text class="breeze-ci-image-save-r1" x="207.4" y="361.6" textLength="719.8" clip-path="url(#breeze-ci-image-save-line-14)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-14)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-14)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="386" textLength="73.2" clip-path="url(#breeze-ci-image-save-line-15)">--help</text><text class="breeze-ci-image-save-r6" x="158.6" y="386" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-15)">-h</text><text class="breeze-ci-image-save-r1" x="207.4" y="386" textLength="329.4" clip-path="url(#breeze-ci-image-save-line-15)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">
-</text><text class="breeze-ci-image-save-r5" x="0" y="410.4" textLength="1464" clip-path="url(#breeze-ci-image-save-line-16)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-save-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-16)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-11)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="288.4" textLength="195.2" clip-path="url(#breeze-ci-image-save-line-11)">--image-file-dir</text><text class="breeze-ci-image-save-r1" x="329.4" y="288.4" textLength="854" clip-path="url(#breeze-ci-image-save-line-11)">The&#160;path&#160;to&#160;the&#160;directory&#160;where&#160;the&#160;image&#160;files&#160;are&#160;stored&#160;by&#160;default.</text><text class="breeze-ci-image-save-r7" x="1195.6" y="288.4" textLength="134.2" clip-path="url(#breeze-ci-image-save-line-11)">(DIRECTORY)</text><text class="breeze-ci-image-save-r5" x="1451.8" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-11)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-11)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-12)">│</text><text class="breeze-ci-image-save-r5" x="329.4" y="312.8" textLength="854" clip-path="url(#breeze-ci-image-save-line-12)">[default:&#160;/tmp]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-ci-image-save-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-12)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-12)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="337.2" textLength="1464" clip-path="url(#breeze-ci-image-save-line-13)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-save-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-13)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="361.6" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-14)">╭─</text><text class="breeze-ci-image-save-r5" x="24.4" y="361.6" textLength="195.2" clip-path="url(#breeze-ci-image-save-line-14)">&#160;Common&#160;options&#160;</text><text class="breeze-ci-image-save-r5" x="219.6" y="361.6" textLength="1220" clip-path="url(#breeze-ci-image-save-line-14)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-ci-image-save-r5" x="1439.6" y="361.6" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-14)">─╮</text><text class="breeze-ci-image-save-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-14)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="386" textLength="109.8" clip-path="url(#breeze-ci-image-save-line-15)">--verbose</text><text class="breeze-ci-image-save-r6" x="158.6" y="386" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-15)">-v</text><text class="breeze-ci-image-save-r1" x="207.4" y="386" textLength="585.6" clip-path="url(#breeze-ci-image-save-line-15)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-15)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-16)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="410.4" textLength="109.8" clip-path="url(#breeze-ci-image-save-line-16)">--dry-run</text><text class="breeze-ci-image-save-r6" x="158.6" y="410.4" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-16)">-D</text><text class="breeze-ci-image-save-r1" x="207.4" y="410.4" textLength="719.8" clip-path="url(#breeze-ci-image-save-line-16)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-16)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-16)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-17)">│</text><text class="breeze-ci-image-save-r4" x="24.4" y="434.8" textLength="73.2" clip-path="url(#breeze-ci-image-save-line-17)">--help</text><text class="breeze-ci-image-save-r6" x="158.6" y="434.8" textLength="24.4" clip-path="url(#breeze-ci-image-save-line-17)">-h</text><text class="breeze-ci-image-save-r1" x="207.4" y="434.8" textLength="329.4" clip-path="url(#breeze-ci-image-save-line-17)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-ci-image-save-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-17)">│</text><text class="breeze-ci-image-save-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-17)">
+</text><text class="breeze-ci-image-save-r5" x="0" y="459.2" textLength="1464" clip-path="url(#breeze-ci-image-save-line-18)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-ci-image-save-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-ci-image-save-line-18)">
 </text>
     </g>
     </g>
diff --git a/dev/breeze/doc/images/output_ci-image_save.txt b/dev/breeze/doc/images/output_ci-image_save.txt
index 08b54f9dbf6eb..d3cd73b5d6a2f 100644
--- a/dev/breeze/doc/images/output_ci-image_save.txt
+++ b/dev/breeze/doc/images/output_ci-image_save.txt
@@ -1 +1 @@
-5e39794e1b52acdd4d3aa27df9a2adc3
+caec8866bcacbbe64ad8d4d2b056590e
diff --git a/dev/breeze/doc/images/output_prod-image_load.svg b/dev/breeze/doc/images/output_prod-image_load.svg
index e967cd8481445..35d80135c6cc8 100644
--- a/dev/breeze/doc/images/output_prod-image_load.svg
+++ b/dev/breeze/doc/images/output_prod-image_load.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 708.8" xmlns="http://www.w3.org/2000/svg">
+<svg class="rich-terminal" viewBox="0 0 1482 782.0" xmlns="http://www.w3.org/2000/svg">
     <!-- Generated with Rich https://www.textualize.io -->
     <style>
 
@@ -45,7 +45,7 @@
 
     <defs>
     <clipPath id="breeze-prod-image-load-clip-terminal">
-      <rect x="0" y="0" width="1463.0" height="657.8" />
+      <rect x="0" y="0" width="1463.0" height="731.0" />
     </clipPath>
     <clipPath id="breeze-prod-image-load-line-0">
     <rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -125,9 +125,18 @@
 <clipPath id="breeze-prod-image-load-line-25">
     <rect x="0" y="611.5" width="1464" height="24.65"/>
             </clipPath>
+<clipPath id="breeze-prod-image-load-line-26">
+    <rect x="0" y="635.9" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-prod-image-load-line-27">
+    <rect x="0" y="660.3" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-prod-image-load-line-28">
+    <rect x="0" y="684.7" width="1464" height="24.65"/>
+            </clipPath>
     </defs>
 
-    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="706.8" rx="8"/><text class="breeze-prod-image-load-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;prod-image&#160;load</text>
+    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="780" rx="8"/><text class="breeze-prod-image-load-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;prod-image&#160;load</text>
             <g transform="translate(26,22)">
             <circle cx="0" cy="0" r="7" fill="#ff5f57"/>
             <circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -148,22 +157,25 @@
 </text><text class="breeze-prod-image-load-r5" x="0" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-8)">│</text><text class="breeze-prod-image-load-r5" x="451.4" y="215.2" textLength="732" clip-path="url(#breeze-prod-image-load-line-8)">[default:&#160;3.9]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-8)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-8)">
 </text><text class="breeze-prod-image-load-r5" x="0" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-9)">│</text><text class="breeze-prod-image-load-r4" x="61" y="239.6" textLength="122" clip-path="url(#breeze-prod-image-load-line-9)">--platform</text><text class="breeze-prod-image-load-r1" x="451.4" y="239.6" textLength="329.4" clip-path="url(#breeze-prod-image-load-line-9)">Platform&#160;for&#160;Airflow&#160;image.</text><text class="breeze-prod-image-load-r7" x="793" y="239.6" textLength="329.4" clip-path="url(#breeze-prod-image-load-line-9)">(linux/amd64&#160;|&#160;linux/arm64)</text><text class="breeze-prod-image-load-r5" x="1451.8" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-9)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-9)">
 </text><text class="breeze-prod-image-load-r5" x="0" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-10)">│</text><text class="breeze-prod-image-load-r4" x="61" y="264" textLength="146.4" clip-path="url(#breeze-prod-image-load-line-10)">--image-file</text><text class="breeze-prod-image-load-r1" x="451.4" y="264" textLength="427" clip-path="url(#breeze-prod-image-load-line-10)">Optional&#160;file&#160;to&#160;save&#160;the&#160;image&#160;to.</text><text class="breeze-prod-image-load-r7" x="890.6" y="264" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-10)">(FILE)</text><text class="breeze-prod-image-load-r5" x="1451.8" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-10)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-10)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">│</text><text class="breeze-prod-image-load-r4" x="61" y="288.4" textLength="231.8" clip-path="url(#breeze-prod-image-load-line-11)">--github-repository</text><text class="breeze-prod-image-load-r6" x="402.6" y="288.4" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-11)">-g</text><text class="breeze-prod-image-load-r1" x="451.4" y="288.4" textLength="585.6" clip-path="url(#breeze-prod-image-load-line-11)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-prod-image-load-r7" x="1049.2" y="288.4" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-11)">(TEXT)</text><text class="breeze-prod-image-load-r5" x="1134.6" y="288.4" textLength="305" clip-path="url(#breeze-prod-image-load-line-11)">[default:&#160;apache/airflow]</text><text class="breeze-prod-image-load-r5" x="1451.8" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">│</text><text class="breeze-prod-image-load-r8" x="24.4" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">*</text><text class="breeze-prod-image-load-r4" x="61" y="312.8" textLength="170.8" clip-path="url(#breeze-prod-image-load-line-12)">--github-token</text><text class="breeze-prod-image-load-r1" x="451.4" y="312.8" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-12)">The&#160;token&#160;used&#160;to&#160;authenticate&#160;to&#160;GitHub.&#160;You&#160;can&#160;generate&#160;it&#160;with&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">│</text><text class="breeze-prod-image-load-r1" x="451.4" y="337.2" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-13)">https://github.com/settings/tokens/new?description=Read%20repo&amp;scopes=public_repo</text><text class="breeze-prod-image-load-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">│</text><text class="breeze-prod-image-load-r7" x="451.4" y="361.6" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-14)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">│</text><text class="breeze-prod-image-load-r9" x="451.4" y="386" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-15)">[required]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">│</text><text class="breeze-prod-image-load-r4" x="61" y="410.4" textLength="122" clip-path="url(#breeze-prod-image-load-line-16)">--from-run</text><text class="breeze-prod-image-load-r1" x="451.4" y="410.4" textLength="780.8" clip-path="url(#breeze-prod-image-load-line-16)">Optional&#160;run&#160;id&#160;of&#160;the&#160;github&#160;action&#160;run&#160;to&#160;load&#160;the&#160;image&#160;from.</text><text class="breeze-prod-image-load-r7" x="1244.4" y="410.4" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-16)">(TEXT)</text><text class="breeze-prod-image-load-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">│</text><text class="breeze-prod-image-load-r4" x="61" y="434.8" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-17)">--from-pr</text><text class="breeze-prod-image-load-r1" x="451.4" y="434.8" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-17)">Optional&#160;pr&#160;number&#160;of&#160;the&#160;github&#160;action&#160;job&#160;to&#160;load&#160;the&#160;image&#160;from.&#160;loads&#160;the&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">│</text><text class="breeze-prod-image-load-r1" x="451.4" y="459.2" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-18)">image&#160;from&#160;the&#160;latest&#160;job.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">│</text><text class="breeze-prod-image-load-r7" x="451.4" y="483.6" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-19)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">│</text><text class="breeze-prod-image-load-r4" x="61" y="508" textLength="317.2" clip-path="url(#breeze-prod-image-load-line-20)">--skip-image-file-deletion</text><text class="breeze-prod-image-load-r1" x="451.4" y="508" textLength="414.8" clip-path="url(#breeze-prod-image-load-line-20)">Skip&#160;image&#160;deletion&#160;after&#160;loading.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="532.4" textLength="1464" clip-path="url(#breeze-prod-image-load-line-21)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-load-r1" x="1464" y="532.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-21)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="556.8" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-22)">╭─</text><text class="breeze-prod-image-load-r5" x="24.4" y="556.8" textLength="195.2" clip-path="url(#breeze-prod-image-load-line-22)">&#160;Common&#160;options&#160;</text><text class="breeze-prod-image-load-r5" x="219.6" y="556.8" textLength="1220" clip-path="url(#breeze-prod-image-load-line-22)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-prod-image-load-r5" x="1439.6" y="556.8" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-22)">─╮</text><text class="breeze-prod-image-load-r1" x="1464" y="556.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-22)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="581.2" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-23)">--dry-run</text><text class="breeze-prod-image-load-r6" x="158.6" y="581.2" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-23)">-D</text><text class="breeze-prod-image-load-r1" x="207.4" y="581.2" textLength="719.8" clip-path="url(#breeze-prod-image-load-line-23)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="605.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-24)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="605.6" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-24)">--verbose</text><text class="breeze-prod-image-load-r6" x="158.6" y="605.6" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-24)">-v</text><text class="breeze-prod-image-load-r1" x="207.4" y="605.6" textLength="585.6" clip-path="url(#breeze-prod-image-load-line-24)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="605.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-24)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="605.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-24)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="630" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-25)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="630" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-25)">--help</text><text class="breeze-prod-image-load-r6" x="158.6" y="630" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-25)">-h</text><text class="breeze-prod-image-load-r1" x="207.4" y="630" textLength="329.4" clip-path="url(#breeze-prod-image-load-line-25)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="630" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-25)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="630" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-25)">
-</text><text class="breeze-prod-image-load-r5" x="0" y="654.4" textLength="1464" clip-path="url(#breeze-prod-image-load-line-26)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-load-r1" x="1464" y="654.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-26)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">│</text><text class="breeze-prod-image-load-r4" x="61" y="288.4" textLength="195.2" clip-path="url(#breeze-prod-image-load-line-11)">--image-file-dir</text><text class="breeze-prod-image-load-r1" x="451.4" y="288.4" textLength="854" clip-path="url(#breeze-prod-image-load-line-11)">The&#160;path&#160;to&#160;the&#160;directory&#160;where&#160;the&#160;image&#160;files&#160;are&#160;stored&#160;by&#160;default.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-11)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">│</text><text class="breeze-prod-image-load-r7" x="451.4" y="312.8" textLength="854" clip-path="url(#breeze-prod-image-load-line-12)">(DIRECTORY)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-12)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">│</text><text class="breeze-prod-image-load-r5" x="451.4" y="337.2" textLength="854" clip-path="url(#breeze-prod-image-load-line-13)">[default:&#160;/tmp]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-13)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">│</text><text class="breeze-prod-image-load-r4" x="61" y="361.6" textLength="231.8" clip-path="url(#breeze-prod-image-load-line-14)">--github-repository</text><text class="breeze-prod-image-load-r6" x="402.6" y="361.6" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-14)">-g</text><text class="breeze-prod-image-load-r1" x="451.4" y="361.6" textLength="585.6" clip-path="url(#breeze-prod-image-load-line-14)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-prod-image-load-r7" x="1049.2" y="361.6" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-14)">(TEXT)</text><text class="breeze-prod-image-load-r5" x="1134.6" y="361.6" textLength="305" clip-path="url(#breeze-prod-image-load-line-14)">[default:&#160;apache/airflow]</text><text class="breeze-prod-image-load-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-14)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">│</text><text class="breeze-prod-image-load-r8" x="24.4" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">*</text><text class="breeze-prod-image-load-r4" x="61" y="386" textLength="170.8" clip-path="url(#breeze-prod-image-load-line-15)">--github-token</text><text class="breeze-prod-image-load-r1" x="451.4" y="386" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-15)">The&#160;token&#160;used&#160;to&#160;authenticate&#160;to&#160;GitHub.&#160;You&#160;can&#160;generate&#160;it&#160;with&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-15)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">│</text><text class="breeze-prod-image-load-r1" x="451.4" y="410.4" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-16)">https://github.com/settings/tokens/new?description=Read%20repo&amp;scopes=public_repo</text><text class="breeze-prod-image-load-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-16)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">│</text><text class="breeze-prod-image-load-r7" x="451.4" y="434.8" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-17)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-17)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">│</text><text class="breeze-prod-image-load-r9" x="451.4" y="459.2" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-18)">[required]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-18)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">│</text><text class="breeze-prod-image-load-r4" x="61" y="483.6" textLength="122" clip-path="url(#breeze-prod-image-load-line-19)">--from-run</text><text class="breeze-prod-image-load-r1" x="451.4" y="483.6" textLength="780.8" clip-path="url(#breeze-prod-image-load-line-19)">Optional&#160;run&#160;id&#160;of&#160;the&#160;github&#160;action&#160;run&#160;to&#160;load&#160;the&#160;image&#160;from.</text><text class="breeze-prod-image-load-r7" x="1244.4" y="483.6" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-19)">(TEXT)</text><text class="breeze-prod-image-load-r5" x="1451.8" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="483.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-19)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">│</text><text class="breeze-prod-image-load-r4" x="61" y="508" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-20)">--from-pr</text><text class="breeze-prod-image-load-r1" x="451.4" y="508" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-20)">Optional&#160;pr&#160;number&#160;of&#160;the&#160;github&#160;action&#160;job&#160;to&#160;load&#160;the&#160;image&#160;from.&#160;loads&#160;the&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="508" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-20)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="532.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-21)">│</text><text class="breeze-prod-image-load-r1" x="451.4" y="532.4" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-21)">image&#160;from&#160;the&#160;latest&#160;job.&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="532.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-21)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="532.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-21)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="556.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-22)">│</text><text class="breeze-prod-image-load-r7" x="451.4" y="556.8" textLength="988.2" clip-path="url(#breeze-prod-image-load-line-22)">(TEXT)&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-load-r5" x="1451.8" y="556.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-22)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="556.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-22)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">│</text><text class="breeze-prod-image-load-r4" x="61" y="581.2" textLength="317.2" clip-path="url(#breeze-prod-image-load-line-23)">--skip-image-file-deletion</text><text class="breeze-prod-image-load-r1" x="451.4" y="581.2" textLength="414.8" clip-path="url(#breeze-prod-image-load-line-23)">Skip&#160;image&#160;deletion&#160;after&#160;loading.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="581.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-23)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="605.6" textLength="1464" clip-path="url(#breeze-prod-image-load-line-24)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-load-r1" x="1464" y="605.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-24)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="630" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-25)">╭─</text><text class="breeze-prod-image-load-r5" x="24.4" y="630" textLength="195.2" clip-path="url(#breeze-prod-image-load-line-25)">&#160;Common&#160;options&#160;</text><text class="breeze-prod-image-load-r5" x="219.6" y="630" textLength="1220" clip-path="url(#breeze-prod-image-load-line-25)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-prod-image-load-r5" x="1439.6" y="630" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-25)">─╮</text><text class="breeze-prod-image-load-r1" x="1464" y="630" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-25)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="654.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-26)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="654.4" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-26)">--dry-run</text><text class="breeze-prod-image-load-r6" x="158.6" y="654.4" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-26)">-D</text><text class="breeze-prod-image-load-r1" x="207.4" y="654.4" textLength="719.8" clip-path="url(#breeze-prod-image-load-line-26)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="654.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-26)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="654.4" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-26)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="678.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-27)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="678.8" textLength="109.8" clip-path="url(#breeze-prod-image-load-line-27)">--verbose</text><text class="breeze-prod-image-load-r6" x="158.6" y="678.8" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-27)">-v</text><text class="breeze-prod-image-load-r1" x="207.4" y="678.8" textLength="585.6" clip-path="url(#breeze-prod-image-load-line-27)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="678.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-27)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="678.8" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-27)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="703.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-28)">│</text><text class="breeze-prod-image-load-r4" x="24.4" y="703.2" textLength="73.2" clip-path="url(#breeze-prod-image-load-line-28)">--help</text><text class="breeze-prod-image-load-r6" x="158.6" y="703.2" textLength="24.4" clip-path="url(#breeze-prod-image-load-line-28)">-h</text><text class="breeze-prod-image-load-r1" x="207.4" y="703.2" textLength="329.4" clip-path="url(#breeze-prod-image-load-line-28)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-prod-image-load-r5" x="1451.8" y="703.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-28)">│</text><text class="breeze-prod-image-load-r1" x="1464" y="703.2" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-28)">
+</text><text class="breeze-prod-image-load-r5" x="0" y="727.6" textLength="1464" clip-path="url(#breeze-prod-image-load-line-29)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-load-r1" x="1464" y="727.6" textLength="12.2" clip-path="url(#breeze-prod-image-load-line-29)">
 </text>
     </g>
     </g>
diff --git a/dev/breeze/doc/images/output_prod-image_load.txt b/dev/breeze/doc/images/output_prod-image_load.txt
index 70a8c555ffcfa..eab9d4aaf6a7f 100644
--- a/dev/breeze/doc/images/output_prod-image_load.txt
+++ b/dev/breeze/doc/images/output_prod-image_load.txt
@@ -1 +1 @@
-9c1eaead6434eb98d51302bc5cf471e3
+49d6a49cc118590f711e9df85079c10f
diff --git a/dev/breeze/doc/images/output_prod-image_save.svg b/dev/breeze/doc/images/output_prod-image_save.svg
index 22a02dcc04ff0..19e93d2489fc5 100644
--- a/dev/breeze/doc/images/output_prod-image_save.svg
+++ b/dev/breeze/doc/images/output_prod-image_save.svg
@@ -1,4 +1,4 @@
-<svg class="rich-terminal" viewBox="0 0 1482 464.79999999999995" xmlns="http://www.w3.org/2000/svg">
+<svg class="rich-terminal" viewBox="0 0 1482 513.5999999999999" xmlns="http://www.w3.org/2000/svg">
     <!-- Generated with Rich https://www.textualize.io -->
     <style>
 
@@ -43,7 +43,7 @@
 
     <defs>
     <clipPath id="breeze-prod-image-save-clip-terminal">
-      <rect x="0" y="0" width="1463.0" height="413.79999999999995" />
+      <rect x="0" y="0" width="1463.0" height="462.59999999999997" />
     </clipPath>
     <clipPath id="breeze-prod-image-save-line-0">
     <rect x="0" y="1.5" width="1464" height="24.65"/>
@@ -93,9 +93,15 @@
 <clipPath id="breeze-prod-image-save-line-15">
     <rect x="0" y="367.5" width="1464" height="24.65"/>
             </clipPath>
+<clipPath id="breeze-prod-image-save-line-16">
+    <rect x="0" y="391.9" width="1464" height="24.65"/>
+            </clipPath>
+<clipPath id="breeze-prod-image-save-line-17">
+    <rect x="0" y="416.3" width="1464" height="24.65"/>
+            </clipPath>
     </defs>
 
-    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="462.8" rx="8"/><text class="breeze-prod-image-save-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;prod-image&#160;save</text>
+    <rect fill="#292929" stroke="rgba(255,255,255,0.35)" stroke-width="1" x="1" y="1" width="1480" height="511.6" rx="8"/><text class="breeze-prod-image-save-title" fill="#c5c8c6" text-anchor="middle" x="740" y="27">Command:&#160;prod-image&#160;save</text>
             <g transform="translate(26,22)">
             <circle cx="0" cy="0" r="7" fill="#ff5f57"/>
             <circle cx="22" cy="0" r="7" fill="#febc2e"/>
@@ -116,12 +122,14 @@
 </text><text class="breeze-prod-image-save-r5" x="0" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-8)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="215.2" textLength="122" clip-path="url(#breeze-prod-image-save-line-8)">--platform</text><text class="breeze-prod-image-save-r1" x="329.4" y="215.2" textLength="329.4" clip-path="url(#breeze-prod-image-save-line-8)">Platform&#160;for&#160;Airflow&#160;image.</text><text class="breeze-prod-image-save-r7" x="671" y="215.2" textLength="329.4" clip-path="url(#breeze-prod-image-save-line-8)">(linux/amd64&#160;|&#160;linux/arm64)</text><text class="breeze-prod-image-save-r5" x="1451.8" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-8)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="215.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-8)">
 </text><text class="breeze-prod-image-save-r5" x="0" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-9)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="239.6" textLength="231.8" clip-path="url(#breeze-prod-image-save-line-9)">--github-repository</text><text class="breeze-prod-image-save-r6" x="280.6" y="239.6" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-9)">-g</text><text class="breeze-prod-image-save-r1" x="329.4" y="239.6" textLength="585.6" clip-path="url(#breeze-prod-image-save-line-9)">GitHub&#160;repository&#160;used&#160;to&#160;pull,&#160;push&#160;run&#160;images.</text><text class="breeze-prod-image-save-r7" x="927.2" y="239.6" textLength="73.2" clip-path="url(#breeze-prod-image-save-line-9)">(TEXT)</text><text class="breeze-prod-image-save-r5" x="1012.6" y="239.6" textLength="305" clip-path="url(#breeze-prod-image-save-line-9)">[default:&#160;apache/airflow]</text><text class="breeze-prod-image-save-r5" x="1451.8" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-9)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="239.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-9)">
 </text><text class="breeze-prod-image-save-r5" x="0" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-10)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="264" textLength="146.4" clip-path="url(#breeze-prod-image-save-line-10)">--image-file</text><text class="breeze-prod-image-save-r1" x="329.4" y="264" textLength="427" clip-path="url(#breeze-prod-image-save-line-10)">Optional&#160;file&#160;to&#160;save&#160;the&#160;image&#160;to.</text><text class="breeze-prod-image-save-r7" x="768.6" y="264" textLength="73.2" clip-path="url(#breeze-prod-image-save-line-10)">(FILE)</text><text class="breeze-prod-image-save-r5" x="1451.8" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-10)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="264" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-10)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="288.4" textLength="1464" clip-path="url(#breeze-prod-image-save-line-11)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-save-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-11)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="312.8" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-12)">╭─</text><text class="breeze-prod-image-save-r5" x="24.4" y="312.8" textLength="195.2" clip-path="url(#breeze-prod-image-save-line-12)">&#160;Common&#160;options&#160;</text><text class="breeze-prod-image-save-r5" x="219.6" y="312.8" textLength="1220" clip-path="url(#breeze-prod-image-save-line-12)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-prod-image-save-r5" x="1439.6" y="312.8" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-12)">─╮</text><text class="breeze-prod-image-save-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-12)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-13)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="337.2" textLength="109.8" clip-path="url(#breeze-prod-image-save-line-13)">--verbose</text><text class="breeze-prod-image-save-r6" x="158.6" y="337.2" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-13)">-v</text><text class="breeze-prod-image-save-r1" x="207.4" y="337.2" textLength="585.6" clip-path="url(#breeze-prod-image-save-line-13)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-13)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-13)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-14)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="361.6" textLength="109.8" clip-path="url(#breeze-prod-image-save-line-14)">--dry-run</text><text class="breeze-prod-image-save-r6" x="158.6" y="361.6" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-14)">-D</text><text class="breeze-prod-image-save-r1" x="207.4" y="361.6" textLength="719.8" clip-path="url(#breeze-prod-image-save-line-14)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-14)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-14)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="386" textLength="73.2" clip-path="url(#breeze-prod-image-save-line-15)">--help</text><text class="breeze-prod-image-save-r6" x="158.6" y="386" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-15)">-h</text><text class="breeze-prod-image-save-r1" x="207.4" y="386" textLength="329.4" clip-path="url(#breeze-prod-image-save-line-15)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">
-</text><text class="breeze-prod-image-save-r5" x="0" y="410.4" textLength="1464" clip-path="url(#breeze-prod-image-save-line-16)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-save-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-16)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-11)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="288.4" textLength="195.2" clip-path="url(#breeze-prod-image-save-line-11)">--image-file-dir</text><text class="breeze-prod-image-save-r1" x="329.4" y="288.4" textLength="854" clip-path="url(#breeze-prod-image-save-line-11)">The&#160;path&#160;to&#160;the&#160;directory&#160;where&#160;the&#160;image&#160;files&#160;are&#160;stored&#160;by&#160;default.</text><text class="breeze-prod-image-save-r7" x="1195.6" y="288.4" textLength="134.2" clip-path="url(#breeze-prod-image-save-line-11)">(DIRECTORY)</text><text class="breeze-prod-image-save-r5" x="1451.8" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-11)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="288.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-11)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-12)">│</text><text class="breeze-prod-image-save-r5" x="329.4" y="312.8" textLength="854" clip-path="url(#breeze-prod-image-save-line-12)">[default:&#160;/tmp]&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;</text><text class="breeze-prod-image-save-r5" x="1451.8" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-12)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="312.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-12)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="337.2" textLength="1464" clip-path="url(#breeze-prod-image-save-line-13)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-save-r1" x="1464" y="337.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-13)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="361.6" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-14)">╭─</text><text class="breeze-prod-image-save-r5" x="24.4" y="361.6" textLength="195.2" clip-path="url(#breeze-prod-image-save-line-14)">&#160;Common&#160;options&#160;</text><text class="breeze-prod-image-save-r5" x="219.6" y="361.6" textLength="1220" clip-path="url(#breeze-prod-image-save-line-14)">────────────────────────────────────────────────────────────────────────────────────────────────────</text><text class="breeze-prod-image-save-r5" x="1439.6" y="361.6" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-14)">─╮</text><text class="breeze-prod-image-save-r1" x="1464" y="361.6" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-14)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="386" textLength="109.8" clip-path="url(#breeze-prod-image-save-line-15)">--verbose</text><text class="breeze-prod-image-save-r6" x="158.6" y="386" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-15)">-v</text><text class="breeze-prod-image-save-r1" x="207.4" y="386" textLength="585.6" clip-path="url(#breeze-prod-image-save-line-15)">Print&#160;verbose&#160;information&#160;about&#160;performed&#160;steps.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="386" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-15)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-16)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="410.4" textLength="109.8" clip-path="url(#breeze-prod-image-save-line-16)">--dry-run</text><text class="breeze-prod-image-save-r6" x="158.6" y="410.4" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-16)">-D</text><text class="breeze-prod-image-save-r1" x="207.4" y="410.4" textLength="719.8" clip-path="url(#breeze-prod-image-save-line-16)">If&#160;dry-run&#160;is&#160;set,&#160;commands&#160;are&#160;only&#160;printed,&#160;not&#160;executed.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-16)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="410.4" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-16)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-17)">│</text><text class="breeze-prod-image-save-r4" x="24.4" y="434.8" textLength="73.2" clip-path="url(#breeze-prod-image-save-line-17)">--help</text><text class="breeze-prod-image-save-r6" x="158.6" y="434.8" textLength="24.4" clip-path="url(#breeze-prod-image-save-line-17)">-h</text><text class="breeze-prod-image-save-r1" x="207.4" y="434.8" textLength="329.4" clip-path="url(#breeze-prod-image-save-line-17)">Show&#160;this&#160;message&#160;and&#160;exit.</text><text class="breeze-prod-image-save-r5" x="1451.8" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-17)">│</text><text class="breeze-prod-image-save-r1" x="1464" y="434.8" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-17)">
+</text><text class="breeze-prod-image-save-r5" x="0" y="459.2" textLength="1464" clip-path="url(#breeze-prod-image-save-line-18)">╰──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯</text><text class="breeze-prod-image-save-r1" x="1464" y="459.2" textLength="12.2" clip-path="url(#breeze-prod-image-save-line-18)">
 </text>
     </g>
     </g>
diff --git a/dev/breeze/doc/images/output_prod-image_save.txt b/dev/breeze/doc/images/output_prod-image_save.txt
index 6d99ebe8a918d..67c0b2d03351d 100644
--- a/dev/breeze/doc/images/output_prod-image_save.txt
+++ b/dev/breeze/doc/images/output_prod-image_save.txt
@@ -1 +1 @@
-78350e63d93b1f8f3ae8ea55711dc567
+ee6f2349e5578c5d65cd8a0127d494a9
diff --git a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
index 8c256d022d7dc..772922d0e1633 100644
--- a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
@@ -46,6 +46,7 @@
     option_from_pr,
     option_from_run,
     option_github_token_for_images,
+    option_image_file_dir,
     option_install_mysql_client_type,
     option_platform_multiple,
     option_prepare_buildx_cache,
@@ -290,11 +291,12 @@ def get_exitcode(status: int) -> int:
 option_ci_image_file_to_load = click.option(
     "--image-file",
     required=False,
-    type=click.Path(exists=True, dir_okay=False, readable=True, path_type=Path, resolve_path=True),
+    type=click.Path(dir_okay=False, readable=True, path_type=Path, resolve_path=True),
     envvar="IMAGE_FILE",
     help="Optional file name to load the image from - name must follow the convention:"
     "`ci-image-save-{escaped_platform}-*-{python_version}.tar`. where escaped_platform is one of "
-    "linux_amd64 or linux_arm64.",
+    "linux_amd64 or linux_arm64. If it does not exist in current working dir and if you do not specify "
+    "absolute file, it will be searched for in the --image-file-dir.",
 )
 
 
@@ -601,17 +603,19 @@ def run_verify_in_parallel(
 
 
 @ci_image.command(name="save")
-@option_python
-@option_platform_single
+@option_ci_image_file_to_save
 @option_github_repository
+@option_image_file_dir
+@option_platform_single
+@option_python
 @option_verbose
-@option_ci_image_file_to_save
 @option_dry_run
 def save(
     python: str,
     platform: str,
     github_repository: str,
     image_file: Path | None,
+    image_file_dir: Path,
 ):
     """Save CI image to a file."""
     perform_environment_checks()
@@ -623,9 +627,15 @@ def save(
         run_command(["docker", "buildx", "du", "--verbose"], check=False)
     escaped_platform = platform.replace("/", "_")
     if not image_file:
-        image_file = Path(f"/tmp/ci-image-save-{escaped_platform}-{python}.tar")
-    get_console().print(f"[info]Saving Python CI image {image_name} to {image_file}[/]")
-    result = run_command(["docker", "image", "save", "-o", image_file.as_posix(), image_name], check=False)
+        image_file_to_store = image_file_dir / f"ci-image-save-{escaped_platform}-{python}.tar"
+    elif image_file.is_absolute():
+        image_file_to_store = image_file
+    else:
+        image_file_to_store = image_file_dir / image_file
+    get_console().print(f"[info]Saving Python CI image {image_name} to {image_file_to_store}[/]")
+    result = run_command(
+        ["docker", "image", "save", "-o", image_file_to_store.as_posix(), image_name], check=False
+    )
     if result.returncode != 0:
         get_console().print(f"[error]Error when saving image: {result.stdout}[/]")
         sys.exit(result.returncode)
@@ -638,6 +648,7 @@ def save(
 @option_from_pr
 @option_github_repository
 @option_github_token_for_images
+@option_image_file_dir
 @option_platform_single
 @option_python
 @option_skip_image_file_deletion
@@ -648,6 +659,7 @@ def load(
     github_repository: str,
     github_token: str,
     image_file: Path | None,
+    image_file_dir: Path,
     platform: str,
     python: str,
     skip_image_file_deletion: bool,
@@ -659,37 +671,41 @@ def load(
         github_repository=github_repository,
     )
     escaped_platform = platform.replace("/", "_")
-    path = f"/tmp/ci-image-save-{escaped_platform}-{python}.tar"
-
-    if from_run:
-        download_artifact_from_run_id(from_run, path, github_repository, github_token)
-    elif from_pr:
-        download_artifact_from_pr(from_pr, path, github_repository, github_token)
 
     if not image_file:
-        image_file = Path(path)
-    if not image_file.exists():
-        get_console().print(f"[error]The image {image_file} does not exist.[/]")
+        image_file_to_load = image_file_dir / f"ci-image-save-{escaped_platform}-{python}.tar"
+    elif image_file.is_absolute() or image_file.exists():
+        image_file_to_load = image_file
+    else:
+        image_file_to_load = image_file_dir / image_file
+
+    if not image_file_to_load.exists():
+        get_console().print(f"[error]The image {image_file_to_load} does not exist.[/]")
         sys.exit(1)
-    if not image_file.name.endswith(f"-{python}.tar"):
+    if not image_file_to_load.name.endswith(f"-{python}.tar"):
         get_console().print(
-            f"[error]The image file {image_file} does not end with '-{python}.tar'. Exiting.[/]"
+            f"[error]The image file {image_file_to_load} does not end with '-{python}.tar'. Exiting.[/]"
         )
         sys.exit(1)
-    if not image_file.name.startswith(f"ci-image-save-{escaped_platform}"):
+    if not image_file_to_load.name.startswith(f"ci-image-save-{escaped_platform}"):
         get_console().print(
-            f"[error]The image file {image_file} does not start with 'ci-image-save-{escaped_platform}'. "
-            f"Exiting.[/]"
+            f"[error]The image file {image_file_to_load} does not start with "
+            f"'ci-image-save-{escaped_platform}'. Exiting.[/]"
         )
         sys.exit(1)
-    get_console().print(f"[info]Loading Python CI image from {image_file}[/]")
-    result = run_command(["docker", "image", "load", "-i", image_file.as_posix()], check=False)
+
+    if from_run:
+        download_artifact_from_run_id(from_run, image_file_to_load, github_repository, github_token)
+    elif from_pr:
+        download_artifact_from_pr(from_pr, image_file_to_load, github_repository, github_token)
+    get_console().print(f"[info]Loading Python CI image from {image_file_to_load}[/]")
+    result = run_command(["docker", "image", "load", "-i", image_file_to_load.as_posix()], check=False)
     if result.returncode != 0:
         get_console().print(f"[error]Error when loading image: {result.stdout}[/]")
         sys.exit(result.returncode)
     if not skip_image_file_deletion:
-        get_console().print(f"[info]Deleting image file {image_file}[/]")
-        image_file.unlink()
+        get_console().print(f"[info]Deleting image file {image_file_to_load}[/]")
+        image_file_to_load.unlink()
     if get_verbose():
         run_command(["docker", "images", "-a"])
     mark_image_as_rebuilt(ci_image_params=build_ci_params)
diff --git a/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py b/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
index 298371393d8a1..79ec507535634 100644
--- a/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
+++ b/dev/breeze/src/airflow_breeze/commands/ci_image_commands_config.py
@@ -174,6 +174,7 @@
                 "--platform",
                 "--github-repository",
                 "--image-file",
+                "--image-file-dir",
             ],
         },
     ],
@@ -184,6 +185,7 @@
                 "--python",
                 "--platform",
                 "--image-file",
+                "--image-file-dir",
                 "--github-repository",
                 "--github-token",
                 "--from-pr",
diff --git a/dev/breeze/src/airflow_breeze/commands/common_image_options.py b/dev/breeze/src/airflow_breeze/commands/common_image_options.py
index 3508d310e1030..ebab00c8e18f5 100644
--- a/dev/breeze/src/airflow_breeze/commands/common_image_options.py
+++ b/dev/breeze/src/airflow_breeze/commands/common_image_options.py
@@ -17,6 +17,9 @@
 
 from __future__ import annotations
 
+import tempfile
+from pathlib import Path
+
 import click
 
 from airflow_breeze.branch_defaults import DEFAULT_AIRFLOW_CONSTRAINTS_BRANCH
@@ -211,3 +214,19 @@
     envvar="GITHUB_TOKEN",
     required=True,
 )
+option_image_file_dir = click.option(
+    "--image-file-dir",
+    help="The path to the directory where the image files are stored by default.",
+    envvar="IMAGE_FILE_DIR",
+    type=click.Path(
+        exists=True,
+        file_okay=False,
+        dir_okay=True,
+        resolve_path=True,
+        writable=True,
+        readable=True,
+        path_type=Path,
+    ),
+    default=tempfile.gettempdir(),
+    show_default=True,
+)
diff --git a/dev/breeze/src/airflow_breeze/commands/production_image_commands.py b/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
index 96cdad3f0918d..0f5e95f54b79b 100644
--- a/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/production_image_commands.py
@@ -42,6 +42,7 @@
     option_from_pr,
     option_from_run,
     option_github_token_for_images,
+    option_image_file_dir,
     option_install_mysql_client_type,
     option_platform_multiple,
     option_prepare_buildx_cache,
@@ -165,7 +166,7 @@ def prepare_for_building_prod_image(params: BuildProdParams):
 option_prod_image_file_to_load = click.option(
     "--image-file",
     required=False,
-    type=click.Path(exists=True, dir_okay=False, readable=True, path_type=Path, resolve_path=True),
+    type=click.Path(dir_okay=False, readable=True, path_type=Path, resolve_path=True),
     envvar="IMAGE_FILE",
     help="Optional file name to load the image from - name must follow the convention:"
     "`prod-image-save-{escaped_platform}-*-{python_version}.tar` where escaped_platform is one of "
@@ -616,17 +617,19 @@ def verify(
 
 
 @prod_image.command(name="save")
-@option_python
-@option_platform_single
 @option_github_repository
-@option_verbose
+@option_image_file_dir
+@option_platform_single
 @option_prod_image_file_to_save
+@option_python
+@option_verbose
 @option_dry_run
 def save(
     python: str,
     platform: str,
     github_repository: str,
     image_file: Path | None,
+    image_file_dir: Path,
 ):
     """Save PROD image to a file."""
     perform_environment_checks()
@@ -638,9 +641,15 @@ def save(
         run_command(["docker", "buildx", "du", "--verbose"], check=False)
     escaped_platform = platform.replace("/", "_")
     if not image_file:
-        image_file = Path(f"/tmp/prod-image-save-{escaped_platform}-{python}.tar")
-    get_console().print(f"[info]Saving Python PROD image {image_name} to {image_file}[/]")
-    result = run_command(["docker", "image", "save", "-o", image_file.as_posix(), image_name], check=False)
+        image_file_to_store = image_file_dir / f"prod-image-save-{escaped_platform}-{python}.tar"
+    elif image_file.is_absolute():
+        image_file_to_store = image_file
+    else:
+        image_file_to_store = image_file_dir / image_file
+    get_console().print(f"[info]Saving Python PROD image {image_name} to {image_file_to_store}[/]")
+    result = run_command(
+        ["docker", "image", "save", "-o", image_file_to_store.as_posix(), image_name], check=False
+    )
     if result.returncode != 0:
         get_console().print(f"[error]Error when saving image: {result.stdout}[/]")
         sys.exit(result.returncode)
@@ -652,6 +661,7 @@ def save(
 @option_from_pr
 @option_github_repository
 @option_github_token_for_images
+@option_image_file_dir
 @option_platform_single
 @option_prod_image_file_to_save
 @option_python
@@ -663,6 +673,7 @@ def load(
     github_repository: str,
     github_token: str,
     image_file: Path | None,
+    image_file_dir: Path,
     platform: str,
     python: str,
     skip_image_file_deletion: bool,
@@ -670,35 +681,40 @@ def load(
     """Load PROD image from a file."""
     perform_environment_checks()
     escaped_platform = platform.replace("/", "_")
-    path = f"/tmp/prod-image-save-{escaped_platform}-{python}.tar"
+
+    if not image_file:
+        image_file_to_load = image_file_dir / f"prod-image-save-{escaped_platform}-{python}.tar"
+    elif image_file.is_absolute() or image_file.exists():
+        image_file_to_load = image_file
+    else:
+        image_file_to_load = image_file_dir / image_file
     if from_run:
-        download_artifact_from_run_id(from_run, path, github_repository, github_token)
+        download_artifact_from_run_id(from_run, image_file_to_load, github_repository, github_token)
     elif from_pr:
-        download_artifact_from_pr(from_pr, path, github_repository, github_token)
-    if not image_file:
-        image_file = Path(path)
-    if not image_file.exists():
-        get_console().print(f"[error]The image {image_file} does not exist.[/]")
+        download_artifact_from_pr(from_pr, image_file_to_load, github_repository, github_token)
+
+    if not image_file_to_load.exists():
+        get_console().print(f"[error]The image {image_file_to_load} does not exist.[/]")
         sys.exit(1)
-    if not image_file.name.endswith(f"-{python}.tar"):
+    if not image_file_to_load.name.endswith(f"-{python}.tar"):
         get_console().print(
-            f"[error]The image file {image_file} does not end with '-{python}.tar'. Exiting.[/]"
+            f"[error]The image file {image_file_to_load} does not end with '-{python}.tar'. Exiting.[/]"
         )
         sys.exit(1)
-    if not image_file.name.startswith(f"prod-image-save-{escaped_platform}"):
+    if not image_file_to_load.name.startswith(f"prod-image-save-{escaped_platform}"):
         get_console().print(
-            f"[error]The image file {image_file} does not start with 'prod-image-save-{escaped_platform}'"
+            f"[error]The image file {image_file_to_load} does not start with 'prod-image-save-{escaped_platform}'"
             f". Exiting.[/]"
         )
         sys.exit(1)
-    get_console().print(f"[info]Loading Python PROD image from {image_file}[/]")
-    result = run_command(["docker", "image", "load", "-i", image_file.as_posix()], check=False)
+    get_console().print(f"[info]Loading Python PROD image from {image_file_to_load}[/]")
+    result = run_command(["docker", "image", "load", "-i", image_file_to_load.as_posix()], check=False)
     if result.returncode != 0:
         get_console().print(f"[error]Error when loading image: {result.stdout}[/]")
         sys.exit(result.returncode)
     if not skip_image_file_deletion:
-        get_console().print(f"[info]Deleting image file {image_file}[/]")
-        image_file.unlink()
+        get_console().print(f"[info]Deleting image file {image_file_to_load}[/]")
+        image_file_to_load.unlink()
     if get_verbose():
         run_command(["docker", "images", "-a"])
 
diff --git a/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py b/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
index afdb05ebc63a6..27fb278b10b3a 100644
--- a/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
+++ b/dev/breeze/src/airflow_breeze/commands/production_image_commands_config.py
@@ -184,6 +184,7 @@
                 "--platform",
                 "--github-repository",
                 "--image-file",
+                "--image-file-dir",
             ],
         },
     ],
@@ -194,6 +195,7 @@
                 "--python",
                 "--platform",
                 "--image-file",
+                "--image-file-dir",
                 "--github-repository",
                 "--github-token",
                 "--from-run",
diff --git a/dev/breeze/src/airflow_breeze/utils/github.py b/dev/breeze/src/airflow_breeze/utils/github.py
index e90b0a801dee6..47b3f814be413 100644
--- a/dev/breeze/src/airflow_breeze/utils/github.py
+++ b/dev/breeze/src/airflow_breeze/utils/github.py
@@ -182,7 +182,7 @@ def get_tag_date(tag: str) -> str | None:
     return datetime.fromtimestamp(timestamp, tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
-def download_artifact_from_run_id(run_id: str, output_file: str, github_repository: str, github_token: str):
+def download_artifact_from_run_id(run_id: str, output_file: Path, github_repository: str, github_token: str):
     """
     Downloads a file from GitHub Actions artifact
 
@@ -247,7 +247,7 @@ def download_artifact_from_run_id(run_id: str, output_file: str, github_reposito
     os.remove(temp_file)
 
 
-def download_artifact_from_pr(pr: str, output_file: str, github_repository: str, github_token: str):
+def download_artifact_from_pr(pr: str, output_file: Path, github_repository: str, github_token: str):
     import requests
 
     pr_number = pr.lstrip("#")

From 14f6622827c216a1091b24778e868598422ad9f1 Mon Sep 17 00:00:00 2001
From: GPK <gopidesupavan@gmail.com>
Date: Sat, 11 Jan 2025 09:20:09 +0000
Subject: [PATCH 20/24] Provide package write permissions to
 push-ci-image-cache job (#45573)

---
 .github/workflows/push-image-cache.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push-image-cache.yml b/.github/workflows/push-image-cache.yml
index 86ec3b2a85a86..7698fc88e5388 100644
--- a/.github/workflows/push-image-cache.yml
+++ b/.github/workflows/push-image-cache.yml
@@ -80,8 +80,6 @@ on:  # yamllint disable-line rule:truthy
         description: "Disable airflow repo cache read from main."
         required: true
         type: string
-permissions:
-  contents: read
 jobs:
   push-ci-image-cache:
     name: "Push CI ${{ inputs.cache-type }}:${{ matrix.python }} image cache "
@@ -90,6 +88,9 @@ jobs:
     # instead of an array of strings.
     # yamllint disable-line rule:line-length
     runs-on: ${{ (inputs.platform == 'linux/amd64') && fromJSON(inputs.runs-on-as-json-public) || fromJSON(inputs.runs-on-as-json-self-hosted) }}
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -163,6 +164,9 @@ jobs:
     # instead of an array of strings.
     # yamllint disable-line rule:line-length
     runs-on: ${{ (inputs.platform == 'linux/amd64') && fromJSON(inputs.runs-on-as-json-public) || fromJSON(inputs.runs-on-as-json-self-hosted) }}
+    permissions:
+      contents: read
+      packages: write
     strategy:
       fail-fast: false
       matrix:

From 6844cce95e1d02b06a2de7159db9eb2ea48ac74b Mon Sep 17 00:00:00 2001
From: Jarek Potiuk <jarek@potiuk.com>
Date: Sat, 11 Jan 2025 11:16:57 +0100
Subject: [PATCH 21/24] Fix --from-pr feature for image load and stabilize help
 (#45575)

This is a follow-up after #45564 - it fixes the `--from-pr` and
`--from-run` to work (it was failing with file does not exist).

Also found out that gettempdir might return different directory
depending on which is your designated tmp directory (for example
in MacOS this is is a longer path in /var/.....) - so we have
to force the default during help generation to always return
"/tmp" so that the --help images do not change depending on which
system you are and what your tmp directory is.
---
 .../src/airflow_breeze/commands/ci_image_commands.py      | 8 +++++---
 .../src/airflow_breeze/commands/common_image_options.py   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
index 772922d0e1633..70d94e425bb60 100644
--- a/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
+++ b/dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
@@ -679,9 +679,6 @@ def load(
     else:
         image_file_to_load = image_file_dir / image_file
 
-    if not image_file_to_load.exists():
-        get_console().print(f"[error]The image {image_file_to_load} does not exist.[/]")
-        sys.exit(1)
     if not image_file_to_load.name.endswith(f"-{python}.tar"):
         get_console().print(
             f"[error]The image file {image_file_to_load} does not end with '-{python}.tar'. Exiting.[/]"
@@ -698,6 +695,11 @@ def load(
         download_artifact_from_run_id(from_run, image_file_to_load, github_repository, github_token)
     elif from_pr:
         download_artifact_from_pr(from_pr, image_file_to_load, github_repository, github_token)
+
+    if not image_file_to_load.exists():
+        get_console().print(f"[error]The image {image_file_to_load} does not exist.[/]")
+        sys.exit(1)
+
     get_console().print(f"[info]Loading Python CI image from {image_file_to_load}[/]")
     result = run_command(["docker", "image", "load", "-i", image_file_to_load.as_posix()], check=False)
     if result.returncode != 0:
diff --git a/dev/breeze/src/airflow_breeze/commands/common_image_options.py b/dev/breeze/src/airflow_breeze/commands/common_image_options.py
index ebab00c8e18f5..3c1e9ed0e82d5 100644
--- a/dev/breeze/src/airflow_breeze/commands/common_image_options.py
+++ b/dev/breeze/src/airflow_breeze/commands/common_image_options.py
@@ -227,6 +227,6 @@
         readable=True,
         path_type=Path,
     ),
-    default=tempfile.gettempdir(),
+    default=tempfile.gettempdir() if not generating_command_images() else "/tmp",
     show_default=True,
 )

From 168f76562e617cd8e8a41ec684bfda09db6b5705 Mon Sep 17 00:00:00 2001
From: Kaxil Naik <kaxilnaik@gmail.com>
Date: Sat, 11 Jan 2025 22:24:00 +0530
Subject: [PATCH 22/24] Minor improvements to TaskSDK's WatchedSubprocess
 (#45578)

Follow-up of https://github.com/apache/airflow/pull/45570 to add some Typehints so my editor (PyCharm) can find `_on_child_started`.

Added/Updated docstrings since `WatchedSubprocess` is now a Base class.

and removed redundant exception handling for `init_log_file`
---
 airflow/dag_processing/processor.py           |  2 +-
 .../airflow/sdk/execution_time/supervisor.py  | 23 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/airflow/dag_processing/processor.py b/airflow/dag_processing/processor.py
index 583b858b585a6..f5623418c917d 100644
--- a/airflow/dag_processing/processor.py
+++ b/airflow/dag_processing/processor.py
@@ -203,7 +203,7 @@ def start(  # type: ignore[override]
         target: Callable[[], None] = _parse_file_entrypoint,
         **kwargs,
     ) -> Self:
-        proc = super().start(target=target, **kwargs)
+        proc: Self = super().start(target=target, **kwargs)
         proc._on_child_started(callbacks, path)
         return proc
 
diff --git a/task_sdk/src/airflow/sdk/execution_time/supervisor.py b/task_sdk/src/airflow/sdk/execution_time/supervisor.py
index b4415e5728f33..002b156cee2db 100644
--- a/task_sdk/src/airflow/sdk/execution_time/supervisor.py
+++ b/task_sdk/src/airflow/sdk/execution_time/supervisor.py
@@ -286,16 +286,28 @@ def exit(n: int) -> NoReturn:
 
 @attrs.define(kw_only=True)
 class WatchedSubprocess:
+    """
+    Base class for managing subprocesses in Airflow's TaskSDK.
+
+    This class handles common functionalities required for subprocess management, such as
+    socket handling, process monitoring, and request handling.
+    """
+
     id: UUID
 
     pid: int
+    """The process ID of the child process"""
+
     stdin: BinaryIO
     """The handle connected to stdin of the child process"""
 
     decoder: TypeAdapter
+    """The decoder to use for incoming messages from the child process."""
 
     _process: psutil.Process
     _requests_fd: int
+    """File descriptor for request handling."""
+
     _num_open_sockets: int = 4
     _exit_code: int | None = attrs.field(default=None, init=False)
 
@@ -308,7 +320,7 @@ def start(
         logger: FilteringBoundLogger | None = None,
         **constructor_kwargs,
     ) -> Self:
-        """Fork and start a new subprocess to execute the given task."""
+        """Fork and start a new subprocess with the specified target function."""
         # Create socketpairs/"pipes" to connect to the stdin and out from the subprocess
         child_stdin, feed_stdin = mkpipe(remote_read=True)
         child_stdout, read_stdout = mkpipe()
@@ -538,6 +550,7 @@ def _check_subprocess_exit(self, raise_on_timeout: bool = False) -> int | None:
 @attrs.define(kw_only=True)
 class ActivitySubprocess(WatchedSubprocess):
     client: Client
+    """The HTTP client to use for communication with the API server."""
 
     _terminal_state: str | None = attrs.field(default=None, init=False)
     _final_state: str | None = attrs.field(default=None, init=False)
@@ -568,7 +581,8 @@ def start(  # type: ignore[override]
         logger: FilteringBoundLogger | None = None,
         **kwargs,
     ) -> Self:
-        proc = super().start(id=what.id, client=client, target=target, logger=logger, **kwargs)
+        """Fork and start a new subprocess to execute the given task."""
+        proc: Self = super().start(id=what.id, client=client, target=target, logger=logger, **kwargs)
         # Tell the task process what it needs to do!
         proc._on_child_started(what, path)
         return proc
@@ -908,10 +922,7 @@ def supervise(
         # If we are told to write logs to a file, redirect the task logger to it.
         from airflow.sdk.log import init_log_file, logging_processors
 
-        try:
-            log_file = init_log_file(log_path)
-        except OSError as e:
-            log.warning("OSError while changing ownership of the log file. ", e)
+        log_file = init_log_file(log_path)
 
         pretty_logs = False
         if pretty_logs:

From 13f5bd6d75f4707091dbeea89b59be9acdcfec87 Mon Sep 17 00:00:00 2001
From: Shahar Epstein <60007259+shahar1@users.noreply.github.com>
Date: Sat, 11 Jan 2025 19:44:34 +0200
Subject: [PATCH 23/24] Update spelling wordlist (#45579)

(cherry picked from commit d53d07ccf277f2d567497e96394f361cee259de2)
---
 docs/spelling_wordlist.txt | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index d85becdb1586b..dafe706a1c3a2 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -9,9 +9,11 @@ ack
 ackIds
 acknowledgement
 acks
+acl
 actionCard
 Acyclic
 acyclic
+adb
 AddressesType
 adf
 adhoc
@@ -66,6 +68,7 @@ apis
 AppBuilder
 appbuilder
 Appflow
+appflow
 approle
 AQL
 arango
@@ -258,6 +261,7 @@ cloudant
 CloudantV
 cloudbuild
 CloudBuildClient
+cloudformation
 cloudml
 cloudpickle
 cloudsqldatabehook
@@ -319,6 +323,7 @@ contextmgr
 contrib
 CoreV
 coroutine
+cosmosdb
 coverals
 cp
 cpu
@@ -374,8 +379,10 @@ Dask
 dask
 daskexecutor
 dat
+databrew
 Databricks
 databricks
+datacatalog
 datacenter
 dataclass
 Datadog
@@ -383,6 +390,7 @@ datadog
 Dataflow
 dataflow
 Dataform
+dataform
 DataFrame
 Dataframe
 dataframe
@@ -397,6 +405,7 @@ Dataplex
 dataplex
 datapoint
 Dataprep
+dataprep
 Dataproc
 dataproc
 DataprocDiagnoseClusterOperator
@@ -453,6 +462,7 @@ DeidentifyContentResponse
 DeidentifyTemplate
 del
 delim
+delitem
 dep
 DependencyMixin
 deploymentUrl
@@ -520,6 +530,7 @@ dotproduct
 DownloadReportV
 downscaling
 downstreams
+dp
 dq
 Drillbit
 Drivy
@@ -529,6 +540,7 @@ ds
 dsl
 Dsn
 dsn
+dts
 dttm
 dtypes
 du
@@ -541,6 +553,7 @@ dynamodb
 dynload
 ec
 ecb
+ECR
 ecs
 EdgeModifier
 EdgeModifiers
@@ -585,6 +598,7 @@ etl
 europe
 eval
 evals
+eventbridge
 EventBufferValueType
 eventlet
 evo
@@ -676,6 +690,7 @@ gcpcloudsql
 GCS
 gcs
 gdbm
+gdrive
 Gelf
 gelf
 generateUploadUrl
@@ -686,6 +701,7 @@ getboolean
 getfqdn
 getframe
 getint
+getitem
 GetPartitions
 getsource
 getters
@@ -791,6 +807,7 @@ IdP
 ie
 iframe
 IGM
+igm
 ignorable
 ignoreUnknownValues
 ImageAnnotatorClient
@@ -855,6 +872,7 @@ ish
 isn
 isort
 istio
+iter
 iterable
 iterables
 iteratively
@@ -942,6 +960,7 @@ Kubernetes
 kubernetes
 KubernetesPodOperator
 Kueue
+kueue
 Kusto
 kv
 kwarg
@@ -958,6 +977,7 @@ latin
 LaunchTemplateParameters
 ldap
 ldaps
+len
 leq
 Letsbonus
 LevelDB
@@ -1022,7 +1042,9 @@ mb
 md
 mediawiki
 memberOf
+memcached
 Memorystore
+memorystore
 Mesos
 mesos
 MessageAttributes
@@ -1062,7 +1084,9 @@ monospace
 Moto
 moto
 mouseover
+msfabric
 msg
+msgraph
 mssql
 mTLS
 mtls
@@ -1094,6 +1118,7 @@ neighbours
 neo
 Neo4j
 neo4j
+neptune
 neq
 NetBIOS
 NetworkPolicy
@@ -1240,6 +1265,7 @@ postgres
 postgresql
 postMessage
 Potiuk
+powerbi
 powershell
 pql
 prc
@@ -1269,6 +1295,7 @@ presign
 presigned
 prestocmd
 prestodb
+pretify
 prev
 Proc
 productionalize
@@ -1336,6 +1363,7 @@ Quboles
 queryParameters
 querystring
 queueing
+quicksight
 quickstart
 quotechar
 rabbitmq
@@ -1345,9 +1373,11 @@ rbac
 rc
 rdbms
 RDS
+rds
 readfp
 Readme
 readme
+readonly
 ReadOnlyCredentials
 readthedocs
 Realtime
@@ -1479,11 +1509,15 @@ serializer
 serializers
 serverless
 ServiceAccount
+ServiceResource
+SES
 sessionmaker
 setattr
 setdefault
+setitem
 setMachineType
 setted
+SFN
 sftp
 SFTPClient
 sharded
@@ -1508,6 +1542,8 @@ SnowflakeHook
 Snowpark
 snowpark
 SnowparkOperator
+SNS
+sns
 somecollection
 somedatabase
 sortable
@@ -1540,6 +1576,8 @@ sqlproxy
 sqlsensor
 Sqoop
 sqoop
+SQS
+sqs
 src
 srv
 ssc
@@ -1575,6 +1613,7 @@ StrictUndefined
 Stringified
 stringified
 Struct
+STS
 subchart
 subclassed
 Subclasses
@@ -1692,6 +1731,7 @@ TicketAudit
 timedelta
 timedeltas
 timeframe
+timespan
 timezones
 tis
 TLS
@@ -1893,6 +1933,7 @@ Yieldr
 yml
 youtrack
 youtube
+yq
 zA
 Zego
 Zendesk

From 1e8977a2ea24e989c6c57ee3cb8e7b6bc4cf6c56 Mon Sep 17 00:00:00 2001
From: Jens Scheffler <95105677+jscheffl@users.noreply.github.com>
Date: Sat, 11 Jan 2025 18:51:21 +0100
Subject: [PATCH 24/24] Ensure teardown tasks are executed when DAG run is set
 to failed (#45530)

* Ensure teardown tasks are executed when DAG run is set to failed

* Also handle the case of setting DAG to success

* Add some documentation to behavior changes

* Add some documentation to behavior changes
---
 airflow/api/common/mark_tasks.py              | 41 +++++-----
 .../howto/setup-and-teardown.rst              |  8 +-
 newsfragments/45530.significant.rst           | 12 +++
 tests/api/common/test_mark_tasks.py           | 76 +++++++++++++++++++
 4 files changed, 119 insertions(+), 18 deletions(-)
 create mode 100644 newsfragments/45530.significant.rst
 create mode 100644 tests/api/common/test_mark_tasks.py

diff --git a/airflow/api/common/mark_tasks.py b/airflow/api/common/mark_tasks.py
index 7c55c3527d154..3bcfdeaa9657d 100644
--- a/airflow/api/common/mark_tasks.py
+++ b/airflow/api/common/mark_tasks.py
@@ -239,15 +239,18 @@ def set_dag_run_state_to_success(
         return []
     if not run_id:
         raise ValueError(f"Invalid dag_run_id: {run_id}")
+
+    # Mark all task instances of the dag run to success - except for teardown as they need to complete work.
+    normal_tasks = [task for task in dag.tasks if not task.is_teardown]
+
     # Mark the dag run to success.
-    if commit:
+    if commit and len(normal_tasks) == len(dag.tasks):
         _set_dag_run_state(dag.dag_id, run_id, DagRunState.SUCCESS, session)
 
-    # Mark all task instances of the dag run to success.
-    for task in dag.tasks:
+    for task in normal_tasks:
         task.dag = dag
     return set_state(
-        tasks=dag.tasks,
+        tasks=normal_tasks,
         run_id=run_id,
         state=TaskInstanceState.SUCCESS,
         commit=commit,
@@ -280,10 +283,6 @@ def set_dag_run_state_to_failed(
     if not run_id:
         raise ValueError(f"Invalid dag_run_id: {run_id}")
 
-    # Mark the dag run to failed.
-    if commit:
-        _set_dag_run_state(dag.dag_id, run_id, DagRunState.FAILED, session)
-
     running_states = (
         TaskInstanceState.RUNNING,
         TaskInstanceState.DEFERRED,
@@ -292,25 +291,26 @@ def set_dag_run_state_to_failed(
 
     # Mark only RUNNING task instances.
     task_ids = [task.task_id for task in dag.tasks]
-    tis = session.scalars(
+    running_tis: list[TaskInstance] = session.scalars(
         select(TaskInstance).where(
             TaskInstance.dag_id == dag.dag_id,
             TaskInstance.run_id == run_id,
             TaskInstance.task_id.in_(task_ids),
             TaskInstance.state.in_(running_states),
         )
-    )
+    ).all()
 
-    task_ids_of_running_tis = [task_instance.task_id for task_instance in tis]
+    # Do not kill teardown tasks
+    task_ids_of_running_tis = [ti.task_id for ti in running_tis if not dag.task_dict[ti.task_id].is_teardown]
 
-    tasks = []
+    running_tasks = []
     for task in dag.tasks:
         if task.task_id in task_ids_of_running_tis:
             task.dag = dag
-            tasks.append(task)
+            running_tasks.append(task)
 
     # Mark non-finished tasks as SKIPPED.
-    tis = session.scalars(
+    pending_tis: list[TaskInstance] = session.scalars(
         select(TaskInstance).filter(
             TaskInstance.dag_id == dag.dag_id,
             TaskInstance.run_id == run_id,
@@ -324,12 +324,19 @@ def set_dag_run_state_to_failed(
         )
     ).all()
 
+    # Do not skip teardown tasks
+    pending_normal_tis = [ti for ti in pending_tis if not dag.task_dict[ti.task_id].is_teardown]
+
     if commit:
-        for ti in tis:
+        for ti in pending_normal_tis:
             ti.set_state(TaskInstanceState.SKIPPED)
 
-    return tis + set_state(
-        tasks=tasks,
+        # Mark the dag run to failed if there is no pending teardown (else this would not be scheduled later).
+        if not any(dag.task_dict[ti.task_id].is_teardown for ti in (running_tis + pending_tis)):
+            _set_dag_run_state(dag.dag_id, run_id, DagRunState.FAILED, session)
+
+    return pending_normal_tis + set_state(
+        tasks=running_tasks,
         run_id=run_id,
         state=TaskInstanceState.FAILED,
         commit=commit,
diff --git a/docs/apache-airflow/howto/setup-and-teardown.rst b/docs/apache-airflow/howto/setup-and-teardown.rst
index 7afb3c4a350b3..c802c8bedaf9d 100644
--- a/docs/apache-airflow/howto/setup-and-teardown.rst
+++ b/docs/apache-airflow/howto/setup-and-teardown.rst
@@ -24,8 +24,9 @@ Key features of setup and teardown tasks:
 
   * If you clear a task, its setups and teardowns will be cleared.
   * By default, teardown tasks are ignored for the purpose of evaluating dag run state.
-  * A teardown task will run if its setup was successful, even if its work tasks failed.
+  * A teardown task will run if its setup was successful, even if its work tasks failed. But it will skip if the setup was skipped.
   * Teardown tasks are ignored when setting dependencies against task groups.
+  * Teardown will also be carried out if the DAG run is manually set to "failed" or "success" to ensure resources will be cleaned-up.
 
 How setup and teardown works
 """"""""""""""""""""""""""""
@@ -231,3 +232,8 @@ Trigger rule behavior for teardowns
 """""""""""""""""""""""""""""""""""
 
 Teardowns use a (non-configurable) trigger rule called ALL_DONE_SETUP_SUCCESS.  With this rule, as long as all upstreams are done and at least one directly connected setup is successful, the teardown will run.  If all of a teardown's setups were skipped or failed, those states will propagate to the teardown.
+
+Side-effect on manual DAG state changes
+"""""""""""""""""""""""""""""""""""""""
+
+As teardown tasks are often used to clean-up resources they need to run also if the DAG is manually terminated. For the purpose of early termination a user can manually mark the DAG run as "success" or "failed" which kills all tasks before completion. If the DAG contains teardown tasks, they will still be executed. Therefore as a side effect allowing teardown tasks to be scheduled, a DAG will not be immediately set to a terminal state if the user requests so.
diff --git a/newsfragments/45530.significant.rst b/newsfragments/45530.significant.rst
new file mode 100644
index 0000000000000..7e2ae8e8ac6a5
--- /dev/null
+++ b/newsfragments/45530.significant.rst
@@ -0,0 +1,12 @@
+Ensure teardown tasks are executed when DAG run is set to failed
+
+Previously when a DAG run was manually set to "failed" or to "success" state the terminal state was set to all tasks.
+But this was a gap for cases when setup- and teardown tasks were defined: If teardown was used to clean-up infrastructure
+or other resources, they were also skipped and thus resources could stay allocated.
+
+As of now when setup tasks had been executed before and the DAG is manually set to "failed" or "success" then teardown
+tasks are executed. Teardown tasks are skipped  if the setup was also skipped.
+
+As a side effect this means if the DAG contains teardown tasks, then the manual marking of DAG as "failed" or "success"
+will need to keep the DAG in running state to ensure that teardown tasks will be scheduled. They would not be scheduled
+if the DAG is diorectly set to "failed" or "success".
diff --git a/tests/api/common/test_mark_tasks.py b/tests/api/common/test_mark_tasks.py
new file mode 100644
index 0000000000000..124232842d9a0
--- /dev/null
+++ b/tests/api/common/test_mark_tasks.py
@@ -0,0 +1,76 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from airflow.api.common.mark_tasks import set_dag_run_state_to_failed, set_dag_run_state_to_success
+from airflow.operators.empty import EmptyOperator
+from airflow.utils.state import TaskInstanceState
+
+if TYPE_CHECKING:
+    from airflow.models.taskinstance import TaskInstance
+
+    from tests_common.pytest_plugin import DagMaker
+
+pytestmark = pytest.mark.db_test
+
+
+def test_set_dag_run_state_to_failed(dag_maker: DagMaker):
+    with dag_maker("TEST_DAG_1"):
+        with EmptyOperator(task_id="teardown").as_teardown():
+            EmptyOperator(task_id="running")
+            EmptyOperator(task_id="pending")
+    dr = dag_maker.create_dagrun()
+    for ti in dr.get_task_instances():
+        if ti.task_id == "running":
+            ti.set_state(TaskInstanceState.RUNNING)
+    dag_maker.session.flush()
+    assert dr.dag
+
+    updated_tis: list[TaskInstance] = set_dag_run_state_to_failed(
+        dag=dr.dag, run_id=dr.run_id, commit=True, session=dag_maker.session
+    )
+    assert len(updated_tis) == 2
+    task_dict = {ti.task_id: ti for ti in updated_tis}
+    assert task_dict["running"].state == TaskInstanceState.FAILED
+    assert task_dict["pending"].state == TaskInstanceState.SKIPPED
+    assert "teardown" not in task_dict
+
+
+def test_set_dag_run_state_to_success(dag_maker: DagMaker):
+    with dag_maker("TEST_DAG_1"):
+        with EmptyOperator(task_id="teardown").as_teardown():
+            EmptyOperator(task_id="running")
+            EmptyOperator(task_id="pending")
+    dr = dag_maker.create_dagrun()
+    for ti in dr.get_task_instances():
+        if ti.task_id == "running":
+            ti.set_state(TaskInstanceState.RUNNING)
+    dag_maker.session.flush()
+    assert dr.dag
+
+    updated_tis: list[TaskInstance] = set_dag_run_state_to_success(
+        dag=dr.dag, run_id=dr.run_id, commit=True, session=dag_maker.session
+    )
+    assert len(updated_tis) == 2
+    task_dict = {ti.task_id: ti for ti in updated_tis}
+    assert task_dict["running"].state == TaskInstanceState.SUCCESS
+    assert task_dict["pending"].state == TaskInstanceState.SUCCESS
+    assert "teardown" not in task_dict