Skip to content

Commit d24893a

Browse files
committed
tools: update docker_run.sh to use px4-dev
updates to use the latest px4 development container Signed-off-by: Ramon Roche <mrpollo@gmail.com>
1 parent b7f07a1 commit d24893a

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

Tools/docker_run.sh

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,7 @@
22

33
if [ -z ${PX4_DOCKER_REPO+x} ]; then
44
echo "guessing PX4_DOCKER_REPO based on input";
5-
if [[ $@ =~ .*px4_fmu.* ]]; then
6-
# nuttx-px4fmu-v{1,2,3,4,5}
7-
PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2022-08-12"
8-
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]] || [[ $@ =~ .*navigator.* ]]; then
9-
# beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default, bluerobotics_navigator_default
10-
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26"
11-
elif [[ $@ =~ .*pilotpi.arm64 ]]; then
12-
# scumaker_pilotpi_arm64
13-
PX4_DOCKER_REPO="px4io/px4-dev-aarch64:2022-08-12"
14-
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
15-
# posix_rpi_cross, posix_bebop_default
16-
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2023-06-26"
17-
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
5+
if [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
186
# clang tools
197
PX4_DOCKER_REPO="px4io/px4-dev-clang:2021-02-04"
208
elif [[ $@ =~ .*tests* ]]; then
@@ -27,17 +15,9 @@ fi
2715

2816
# otherwise default to nuttx
2917
if [ -z ${PX4_DOCKER_REPO+x} ]; then
30-
PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2022-08-12"
18+
PX4_DOCKER_REPO="px4io/px4-dev:v1.16.0-ondemand"
3119
fi
3220

33-
# docker hygiene
34-
35-
#Delete all stopped containers (including data-only containers)
36-
# docker container prune
37-
38-
#Delete all 'untagged/dangling' (<none>) images
39-
# docker image prune
40-
4121
echo "PX4_DOCKER_REPO: $PX4_DOCKER_REPO";
4222

4323
PWD=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

0 commit comments

Comments
 (0)