yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump container tags to 2019-10-24

Browse Source
This commit is contained in:
TSC21
2019-10-24 10:49:22 +01:00
committed by Nuno Marques
parent 5b018ebc83
commit 45c320ba8e
9 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/Jenkinsfile-SITL_tests
View File

@@ -8,7 +8,7 @@ pipeline {
stage('Build') { stage('Build') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2019-10-23' image 'px4io/px4-dev-ros-melodic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -130,7 +130,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true def test_ok = true

4
.ci/Jenkinsfile-SITL_tests_ASan
View File

@@ -8,7 +8,7 @@ pipeline {
stage('Build') { stage('Build') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2019-10-23' image 'px4io/px4-dev-ros-melodic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -131,7 +131,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def run_script = test_def.get('run_script', 'rostest_px4_run.sh') def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
def test_ok = true def test_ok = true

6
.ci/Jenkinsfile-SITL_tests_coverage
View File

@@ -79,7 +79,7 @@ pipeline {
stage('code coverage (python)') { stage('code coverage (python)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2019-10-04' image 'px4io/px4-dev-base-bionic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -99,7 +99,7 @@ pipeline {
stage('unit tests') { stage('unit tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2019-10-04' image 'px4io/px4-dev-base-bionic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -137,7 +137,7 @@ def createTestNode(Map test_def) {
return { return {
node { node {
cleanWs() cleanWs()
docker.image("px4io/px4-dev-ros-melodic:2019-10-23").inside('-e HOME=${WORKSPACE}') { docker.image("px4io/px4-dev-ros-melodic:2019-10-24").inside('-e HOME=${WORKSPACE}') {
stage(test_def.name) { stage(test_def.name) {
def test_ok = true def test_ok = true
sh('export') sh('export')

10
.ci/Jenkinsfile-compile
View File

@@ -9,10 +9,10 @@ pipeline {
script { script {
def build_nodes = [:] def build_nodes = [:]
def docker_images = [ def docker_images = [
armhf: "px4io/px4-dev-armhf:2019-10-04", armhf: "px4io/px4-dev-armhf:2019-10-24",
base: "px4io/px4-dev-base-bionic:2019-10-04", base: "px4io/px4-dev-base-bionic:2019-10-24",
nuttx: "px4io/px4-dev-nuttx:2019-10-04", nuttx: "px4io/px4-dev-nuttx:2019-10-24",
rpi: "px4io/px4-dev-raspi:2019-10-04", rpi: "px4io/px4-dev-raspi:2019-10-24",
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12" snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
] ]
@@ -82,7 +82,7 @@ pipeline {
// TODO: actually upload artifacts to S3 // TODO: actually upload artifacts to S3
// stage('S3 Upload') { // stage('S3 Upload') {
// agent { // agent {
// docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } // docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
// } // }
// options { // options {
// skipDefaultCheckout() // skipDefaultCheckout()

20
.ci/Jenkinsfile-hardware
View File

@@ -11,7 +11,7 @@ pipeline {
stage('px4_fmu-v2_test') { stage('px4_fmu-v2_test') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -35,7 +35,7 @@ pipeline {
stage('px4_fmu-v3_default') { stage('px4_fmu-v3_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -59,7 +59,7 @@ pipeline {
stage('px4_fmu-v4_default') { stage('px4_fmu-v4_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -83,7 +83,7 @@ pipeline {
stage('px4_fmu-v4pro_default') { stage('px4_fmu-v4pro_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -107,7 +107,7 @@ pipeline {
stage('px4_fmu-v5_default') { stage('px4_fmu-v5_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -131,7 +131,7 @@ pipeline {
stage('px4_fmu-v5_critmonitor') { stage('px4_fmu-v5_critmonitor') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -155,7 +155,7 @@ pipeline {
stage('px4_fmu-v5_irqmonitor') { stage('px4_fmu-v5_irqmonitor') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -179,7 +179,7 @@ pipeline {
stage('px4_fmu-v5_stackcheck') { stage('px4_fmu-v5_stackcheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -203,7 +203,7 @@ pipeline {
stage('px4_fmu-v5x_default') { stage('px4_fmu-v5x_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -227,7 +227,7 @@ pipeline {
stage('nxp_fmuk66-v3_default') { stage('nxp_fmuk66-v3_default') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }

2
.circleci/config.yml
View File

@@ -2,7 +2,7 @@ version: 2
jobs: jobs:
build: build:
docker: docker:
- image: px4io/px4-dev-nuttx:2019-07-29 - image: px4io/px4-dev-nuttx:2019-10-24
steps: steps:
- checkout - checkout
- run: - run:

2
.github/workflows/ccpp.yml vendored
View File

@@ -5,7 +5,7 @@ on: [push]
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: px4io/px4-dev-base-bionic:2019-07-29 container: px4io/px4-dev-base-bionic:2019-10-24
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
- name: make - name: make

50
Jenkinsfile vendored
View File

@@ -11,7 +11,7 @@ pipeline {
stage('Catkin build on ROS workspace') { stage('Catkin build on ROS workspace') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros-melodic:2019-10-04' image 'px4io/px4-dev-ros-melodic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -51,7 +51,7 @@ pipeline {
stage('Colcon build on ROS2 workspace') { stage('Colcon build on ROS2 workspace') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-ros2-bouncy:2019-10-04' image 'px4io/px4-dev-ros2-bouncy:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
} }
} }
@@ -82,7 +82,7 @@ pipeline {
stage('Style check') { stage('Style check') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh 'make check_format' sh 'make check_format'
@@ -97,7 +97,7 @@ pipeline {
stage('px4_fmu-v2 (bloaty)') { stage('px4_fmu-v2 (bloaty)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -130,7 +130,7 @@ pipeline {
stage('px4_fmu-v5 (bloaty)') { stage('px4_fmu-v5 (bloaty)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -163,7 +163,7 @@ pipeline {
stage('px4_sitl (bloaty)') { stage('px4_sitl (bloaty)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -196,7 +196,7 @@ pipeline {
stage('px4_fmu-v5 (no ninja)') { stage('px4_fmu-v5 (no ninja)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -222,7 +222,7 @@ pipeline {
stage('px4_sitl (no ninja)') { stage('px4_sitl (no ninja)') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -248,7 +248,7 @@ pipeline {
stage('SITL unit tests') { stage('SITL unit tests') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2019-10-04' image 'px4io/px4-dev-base-bionic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -270,7 +270,7 @@ pipeline {
stage('Clang analyzer') { stage('Clang analyzer') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-clang:2019-10-04' image 'px4io/px4-dev-clang:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -308,7 +308,7 @@ pipeline {
// stage('Clang tidy') { // stage('Clang tidy') {
// agent { // agent {
// docker { // docker {
// image 'px4io/px4-dev-clang:2019-10-04' // image 'px4io/px4-dev-clang:2019-10-24'
// args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' // args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
// } // }
// } // }
@@ -329,7 +329,7 @@ pipeline {
stage('Cppcheck') { stage('Cppcheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2019-10-04' image 'px4io/px4-dev-base-bionic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -367,7 +367,7 @@ pipeline {
stage('Check stack') { stage('Check stack') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -387,7 +387,7 @@ pipeline {
stage('ShellCheck') { stage('ShellCheck') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -406,7 +406,7 @@ pipeline {
stage('Module config validation') { stage('Module config validation') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-base-bionic:2019-10-04' image 'px4io/px4-dev-base-bionic:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -431,7 +431,7 @@ pipeline {
stage('Airframe') { stage('Airframe') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -450,7 +450,7 @@ pipeline {
stage('Parameter') { stage('Parameter') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -469,7 +469,7 @@ pipeline {
stage('Module') { stage('Module') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh 'make distclean' sh 'make distclean'
@@ -489,7 +489,7 @@ pipeline {
stage('uORB graphs') { stage('uORB graphs') {
agent { agent {
docker { docker {
image 'px4io/px4-dev-nuttx:2019-10-04' image 'px4io/px4-dev-nuttx:2019-10-24'
args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
} }
} }
@@ -518,7 +518,7 @@ pipeline {
stage('Devguide') { stage('Devguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')
@@ -548,7 +548,7 @@ pipeline {
stage('Userguide') { stage('Userguide') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')
@@ -576,7 +576,7 @@ pipeline {
stage('QGroundControl') { stage('QGroundControl') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')
@@ -604,7 +604,7 @@ pipeline {
stage('PX4 ROS msgs') { stage('PX4 ROS msgs') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')
@@ -633,7 +633,7 @@ pipeline {
stage('PX4 ROS2 bridge') { stage('PX4 ROS2 bridge') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')
@@ -674,7 +674,7 @@ pipeline {
stage('S3') { stage('S3') {
agent { agent {
docker { image 'px4io/px4-dev-base-bionic:2019-10-04' } docker { image 'px4io/px4-dev-base-bionic:2019-10-24' }
} }
steps { steps {
sh('export') sh('export')

12
Tools/docker_run.sh
View File

@@ -4,22 +4,22 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input"; echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4_fmu.* ]]; then if [[ $@ =~ .*px4_fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5} # nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default # posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-07-29" PX4_DOCKER_REPO="px4io/px4-dev-raspi:2019-10-24"
elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
# eagle, excelsior # eagle, excelsior
PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12" PX4_DOCKER_REPO="lorenzmeier/px4-dev-snapdragon:2018-09-12"
elif [[ $@ =~ .*ocpoc.* ]]; then elif [[ $@ =~ .*ocpoc.* ]]; then
# aerotennaocpoc_ubuntu # aerotennaocpoc_ubuntu
PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-07-29" PX4_DOCKER_REPO="px4io/px4-dev-armhf:2019-10-24"
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools # clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-07-29" PX4_DOCKER_REPO="px4io/px4-dev-clang:2019-10-24"
elif [[ $@ =~ .*tests* ]]; then elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation # run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation-xenial:2019-10-04" PX4_DOCKER_REPO="px4io/px4-dev-simulation-bionic:2019-10-24"
fi fi
else else
echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'"; echo "PX4_DOCKER_REPO is set to '$PX4_DOCKER_REPO'";
@@ -27,7 +27,7 @@ fi
# otherwise default to nuttx # otherwise default to nuttx
if [ -z ${PX4_DOCKER_REPO+x} ]; then if [ -z ${PX4_DOCKER_REPO+x} ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-07-29" PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2019-10-24"
fi fi
# docker hygiene # docker hygiene