From 34d4eb7b9ec1de03692ecbc78ec8675b6e5bb96e Mon Sep 17 00:00:00 2001
From: Ramon Roche <mrpollo@gmail.com>
Date: Mon, 16 Jun 2025 15:57:17 -0700
Subject: [PATCH] ci: update build container (#25059)

adds lark python dependency #25056

https://github.com/PX4/PX4-Autopilot/pull/25056

Signed-off-by: Ramon Roche <mrpollo@gmail.com>
---
 .github/workflows/failsafe_sim.yml      | 2 +-
 .github/workflows/flash_analysis.yml    | 2 +-
 .github/workflows/itcm_check.yml        | 2 +-
 .github/workflows/nuttx_env_config.yml  | 2 +-
 Tools/ci/generate_board_targets_json.py | 5 +++--
 Tools/docker_run.sh                     | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/failsafe_sim.yml b/.github/workflows/failsafe_sim.yml
index fedfd13c310..d88b32f00b1 100644
--- a/.github/workflows/failsafe_sim.yml
+++ b/.github/workflows/failsafe_sim.yml
@@ -27,7 +27,7 @@ jobs:
           "failsafe_web",
         ]
     container:
-      image: px4io/px4-dev:v1.16.0-ondemand
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
       options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
     steps:
       - name: Install Node v20.18.0
diff --git a/.github/workflows/flash_analysis.yml b/.github/workflows/flash_analysis.yml
index 9fd8028fbef..425aa9264c1 100644
--- a/.github/workflows/flash_analysis.yml
+++ b/.github/workflows/flash_analysis.yml
@@ -28,7 +28,7 @@ jobs:
     name: Analyzing ${{ matrix.target }}
     runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev:v1.16.0-ondemand
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
     strategy:
       matrix:
         target: [px4_fmu-v5x, px4_fmu-v6x]
diff --git a/.github/workflows/itcm_check.yml b/.github/workflows/itcm_check.yml
index 94ebab8780f..1793216a47f 100644
--- a/.github/workflows/itcm_check.yml
+++ b/.github/workflows/itcm_check.yml
@@ -22,7 +22,7 @@ jobs:
     name: Checking ${{ matrix.target }}
     runs-on: [runs-on,runner=8cpu-linux-x64,image=ubuntu24-full-x64,"run-id=${{ github.run_id }}",spot=false]
     container:
-      image: px4io/px4-dev:v1.16.0-ondemand
+      image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/nuttx_env_config.yml b/.github/workflows/nuttx_env_config.yml
index d24ae45ba1c..97f85e18f34 100644
--- a/.github/workflows/nuttx_env_config.yml
+++ b/.github/workflows/nuttx_env_config.yml
@@ -31,7 +31,7 @@ jobs:
     - name: Build PX4 and Run Test [${{ matrix.config }}]
       uses: addnab/docker-run-action@v3
       with:
-        image: px4io/px4-dev:v1.16.0-ondemand
+        image: px4io/px4-dev:v1.16.0-rc1-258-g0369abd556
         options: -v ${{ github.workspace }}:/workspace
         run: |
           cd /workspace
diff --git a/Tools/ci/generate_board_targets_json.py b/Tools/ci/generate_board_targets_json.py
index 43605630f5b..75c894b49d5 100755
--- a/Tools/ci/generate_board_targets_json.py
+++ b/Tools/ci/generate_board_targets_json.py
@@ -35,6 +35,7 @@ if args.filter:
     for board in args.filter.split(','):
         board_filter.append(board)
 
+default_container = 'ghcr.io/px4/px4-dev:v1.16.0-rc1-258-g0369abd556'
 build_configs = []
 grouped_targets = {}
 excluded_boards = ['modalai_voxl2', 'px4_ros2']  # TODO: fix and enable
@@ -86,7 +87,7 @@ def process_target(px4board_file, target_name):
     assert platform, f"PLATFORM not found in {px4board_file}"
 
     if platform not in excluded_platforms:
-        container = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
+        container = default_container
         if platform == 'posix':
             group = 'base'
             if toolchain:
@@ -120,7 +121,7 @@ if(verbose):
 # - Events
 metadata_targets = ['airframe_metadata', 'parameters_metadata', 'extract_events']
 grouped_targets['base'] = {}
-grouped_targets['base']['container'] = 'ghcr.io/px4/px4-dev:v1.16.0-ondemand'
+grouped_targets['base']['container'] = default_container
 grouped_targets['base']['manufacturers'] = {}
 grouped_targets['base']['manufacturers']['px4'] = []
 grouped_targets['base']['manufacturers']['px4'] += metadata_targets
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 121c659225e..34d08d16f13 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -15,7 +15,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev:v1.16.0-ondemand"
+	PX4_DOCKER_REPO="px4io/px4-dev:v1.16.0-rc1-258-g0369abd556"
 fi
 
 echo "PX4_DOCKER_REPO: $PX4_DOCKER_REPO";