Move docker device-bot and swarm-bot images to jammy

After crbug.com/1446747, these should be build-adble on jammy.

Bug: 1412588
Change-Id: I06cc5a76522c283f6947d11210b6bdc30fb84ad4
Reviewed-on: https://chromium-review.googlesource.com/c/infra/infra/+/4549423
Reviewed-by: Elliott Friedman <friedman@google.com>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/main@{#56889}
diff --git a/docker/docker_devices/Dockerfile b/docker/docker_devices/Dockerfile
index 98b982f..fbbe7a6 100644
--- a/docker/docker_devices/Dockerfile
+++ b/docker/docker_devices/Dockerfile
@@ -1,11 +1,11 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN /usr/bin/apt-get update
 RUN /usr/bin/apt-get -y dist-upgrade
-RUN /usr/bin/apt-get -y install curl iputils-ping jq locales lsb-release lsof \
-      net-tools netcat-openbsd parted psmisc python python3 rsync sshpass sudo \
+RUN /usr/bin/apt-get -y install curl file iputils-ping jq locales lsb-release \
+      lsof net-tools netcat-openbsd parted psmisc python3 rsync sshpass sudo \
       udev usbutils wget
 
 # Install tzdata here rather than as part of install-build-deps.sh since the
diff --git a/docker/swarm_docker/Dockerfile b/docker/swarm_docker/Dockerfile
index 14f26a3..851a8d9 100644
--- a/docker/swarm_docker/Dockerfile
+++ b/docker/swarm_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -9,7 +9,7 @@
 
 RUN /usr/bin/apt-get update
 RUN /usr/bin/apt-get -y dist-upgrade
-RUN /usr/bin/apt-get -y install curl jq lsof openssh-client psmisc python sudo
+RUN /usr/bin/apt-get -y install curl jq lsof openssh-client psmisc python3 sudo
 RUN /usr/bin/apt-get -y install $ARCH_PACKAGES
 RUN /usr/bin/apt-get -y install $KVM_PACKAGES