Update python version in Xtensa images (#2228)
The Xtensa docker images were using python 3.6, which is incompatible
with some of our python packages. This has not been a problem before
because the Xtensa images only perform make builds with very minimal
python script usage. With the new codegen tools, Bazel is used to invoke
the code generator, and this brings in the incompatible python
dependencies.
This PR changes the base image for the three Xtensa docker containers to
pull to python instead of ubuntu. This is similar to our base TFLM
docker image, which also uses the same python:3.10-bullseye base image.
BUG=b/300655634
diff --git a/ci/Dockerfile.xtensa_xplorer_11 b/ci/Dockerfile.xtensa_xplorer_11
index 0bd72b0..fa7f316 100644
--- a/ci/Dockerfile.xtensa_xplorer_11
+++ b/ci/Dockerfile.xtensa_xplorer_11
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative
RUN \
@@ -9,10 +9,7 @@
curl \
git \
unzip \
- wget \
- python3 \
- python \
- python3-pip
+ wget
WORKDIR /opt/xtensa
@@ -23,9 +20,6 @@
COPY ci/install_bazelisk.sh .
RUN \
- python3 -m pip install -U --force-reinstall pip
-
-RUN \
pip3 install Pillow
RUN \
diff --git a/ci/Dockerfile.xtensa_xplorer_13 b/ci/Dockerfile.xtensa_xplorer_13
index 3994fcd..05deff9 100644
--- a/ci/Dockerfile.xtensa_xplorer_13
+++ b/ci/Dockerfile.xtensa_xplorer_13
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative
RUN \
@@ -9,10 +9,7 @@
curl \
git \
unzip \
- wget \
- python3 \
- python \
- python3-pip
+ wget
WORKDIR /opt/xtensa
@@ -25,9 +22,6 @@
COPY ci/install_bazelisk.sh .
RUN \
- python3 -m pip install -U --force-reinstall pip
-
-RUN \
pip3 install Pillow
RUN \
diff --git a/ci/Dockerfile.xtensa_xplorer_solo b/ci/Dockerfile.xtensa_xplorer_solo
index a97eba8..e7fe205 100644
--- a/ci/Dockerfile.xtensa_xplorer_solo
+++ b/ci/Dockerfile.xtensa_xplorer_solo
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative
RUN \
@@ -9,10 +9,7 @@
curl \
git \
unzip \
- wget \
- python3 \
- python \
- python3-pip
+ wget
WORKDIR /opt/xtensa
@@ -23,9 +20,6 @@
COPY ci/install_bazelisk.sh .
RUN \
- python3 -m pip install -U --force-reinstall pip
-
-RUN \
pip3 install Pillow
RUN \
