From 6e2343a485a51308706757b6d2a2344dcd522571 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 2 May 2021 12:33:51 -0400
Subject: [PATCH] Jenkins: fix new px4io/px4-dev-nuttx-focal container tag

---
 .ci/Jenkinsfile-compile         | 10 +++++-----
 .devcontainer/devcontainer.json |  2 +-
 Tools/docker_run.sh             |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile
index 9956787250..91c00385fb 100644
--- a/.ci/Jenkinsfile-compile
+++ b/.ci/Jenkinsfile-compile
@@ -9,10 +9,10 @@ pipeline {
         script {
           def build_nodes = [:]
           def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2021-02-29",
-            arm64: "px4io/px4-dev-aarch64:2021-02-29",
-            base: "px4io/px4-dev-base-bionic:2021-02-29",
-            nuttx: "px4io/px4-dev-nuttx-focal:2021-02-29",
+            armhf: "px4io/px4-dev-armhf:2021-04-29",
+            arm64: "px4io/px4-dev-aarch64:2021-04-29",
+            base: "px4io/px4-dev-base-bionic:2021-04-29",
+            nuttx: "px4io/px4-dev-nuttx-focal:2021-04-29",
             snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
           ]
 
@@ -130,7 +130,7 @@ pipeline {
     // TODO: actually upload artifacts to S3
     // stage('S3 Upload') {
     //   agent {
-    //     docker { image 'px4io/px4-dev-base-focal:2021-02-29' }
+    //     docker { image 'px4io/px4-dev-base-focal:2021-04-29' }
     //   }
     //   options {
     //         skipDefaultCheckout()
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index eb2dc80d1f..9348ae934e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
 {
 	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-focal:2021-02-04",
+	"image": "px4io/px4-dev-nuttx-focal:2021-04-29",
 
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
 
diff --git a/Tools/docker_run.sh b/Tools/docker_run.sh
index 949df471eb..53e681b10d 100755
--- a/Tools/docker_run.sh
+++ b/Tools/docker_run.sh
@@ -4,7 +4,7 @@ if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
 	if [[ $@ =~ .*px4_fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
-		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-02-04"
+		PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-04-29"
 	elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*beaglebone.* ]] || [[ $@ =~ .*pilotpi.default ]]; then
 		# beaglebone_blue_default, emlid_navio2_default, px4_raspberrypi_default, scumaker_pilotpi_default
 		PX4_DOCKER_REPO="px4io/px4-dev-armhf:2021-02-04"
@@ -30,7 +30,7 @@ fi
 
 # otherwise default to nuttx
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
-	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2020-09-14"
+	PX4_DOCKER_REPO="px4io/px4-dev-nuttx-focal:2021-04-29"
 fi
 
 # docker hygiene