From 6d8441dc893589071b6ef67cc2bc0254c930b190 Mon Sep 17 00:00:00 2001
From: Ramon Roche <mrpollo@gmail.com>
Date: Mon, 9 Feb 2026 15:48:41 -0800
Subject: [PATCH] docker_run.sh: modernize image and clean up stale CI
 references

Update the local Docker convenience script to use the unified
px4io/px4-dev image instead of the retired per-toolchain images
(px4-dev-clang, px4-dev-simulation-bionic).

Usage:
  ./Tools/docker_run.sh make px4_sitl_default
  ./Tools/docker_run.sh make tests TESTFILTER=ULogMessages
  PX4_DOCKER_REPO="px4io/px4-dev:custom" ./Tools/docker_run.sh make px4_fmu-v6x_default

Changes:
- Default to px4io/px4-dev:v1.17.0-beta1, remove conditional image
  guessing for clang/tests targets
- Remove stale env passthrough (Travis CI, AWS, Codecov, Coveralls)
- Keep CCACHE_DIR and sanitizer flags (PX4_ASAN/MSAN/TSAN/UBSAN)
- Fix $PWD shadowing by renaming to SCRIPT_DIR
- Use "$@" instead of "$1 $2 $3" for proper argument forwarding

Signed-off-by: Ramon Roche <mrpollo@gmail.com>
---
 Tools/docker_run.sh | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 34d08d16f1..773c8992eb 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -1,47 +1,27 @@
 #! /bin/bash
 
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	echo "guessing PX4_DOCKER_REPO based on input";
-	if [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
-		# clang tools
-		PX4_DOCKER_REPO="px4io/px4-dev-clang:2021-02-04"
-	elif [[ $@ =~ .*tests* ]]; then
-		# run all tests with simulation
-		PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2021-12-11"
-	fi
+	PX4_DOCKER_REPO="px4io/px4-dev:v1.17.0-beta1"
 else
 	echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
 fi
 
-# otherwise default to nuttx
-if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev:v1.16.0-rc1-258-g0369abd556"
-fi
-
 echo "PX4_DOCKER_REPO: $PX4_DOCKER_REPO";
 
-PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-SRC_DIR=$PWD/../
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+SRC_DIR=${SCRIPT_DIR}/../
 
 CCACHE_DIR=${HOME}/.ccache
 mkdir -p "${CCACHE_DIR}"
 
 docker run -it --rm -w "${SRC_DIR}" \
 	--user="$(id -u):$(id -g)" \
-	--env=AWS_ACCESS_KEY_ID \
-	--env=AWS_SECRET_ACCESS_KEY \
-	--env=BRANCH_NAME \
 	--env=CCACHE_DIR="${CCACHE_DIR}" \
-	--env=CI \
-	--env=CODECOV_TOKEN \
-	--env=COVERALLS_REPO_TOKEN \
 	--env=PX4_ASAN \
 	--env=PX4_MSAN \
 	--env=PX4_TSAN \
 	--env=PX4_UBSAN \
-	--env=TRAVIS_BRANCH \
-	--env=TRAVIS_BUILD_ID \
 	--publish 14556:14556/udp \
 	--volume=${CCACHE_DIR}:${CCACHE_DIR}:rw \
 	--volume=${SRC_DIR}:${SRC_DIR}:rw \
-	${PX4_DOCKER_REPO} /bin/bash -c "$1 $2 $3"
+	${PX4_DOCKER_REPO} /bin/bash -c "$@"