Skip to content

Commit

Permalink
Update python version in Xtensa images (#2228)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
rascani authored Sep 21, 2023
1 parent 4cdcb6e commit d027f2a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 24 deletions.
10 changes: 2 additions & 8 deletions ci/Dockerfile.xtensa_xplorer_11
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative

RUN \
Expand All @@ -9,10 +9,7 @@ RUN \
curl \
git \
unzip \
wget \
python3 \
python \
python3-pip
wget

WORKDIR /opt/xtensa

Expand All @@ -22,9 +19,6 @@ COPY ./XtensaTools_RI_2022_9_linux.tgz .
COPY ci/install_cores_xplorer_11.sh .
COPY ci/install_bazelisk.sh .

RUN \
python3 -m pip install -U --force-reinstall pip

RUN \
pip3 install Pillow

Expand Down
10 changes: 2 additions & 8 deletions ci/Dockerfile.xtensa_xplorer_13
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative

RUN \
Expand All @@ -9,10 +9,7 @@ RUN \
curl \
git \
unzip \
wget \
python3 \
python \
python3-pip
wget

WORKDIR /opt/xtensa

Expand All @@ -24,9 +21,6 @@ COPY ./HIFI_190304_swupgrade_linux.tgz .
COPY ci/install_cores_xplorer_13.sh .
COPY ci/install_bazelisk.sh .

RUN \
python3 -m pip install -U --force-reinstall pip

RUN \
pip3 install Pillow

Expand Down
10 changes: 2 additions & 8 deletions ci/Dockerfile.xtensa_xplorer_solo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:bionic
FROM python:3.10-bullseye
ENV DEBIAN_FRONTEND noninterative

RUN \
Expand All @@ -9,10 +9,7 @@ RUN \
curl \
git \
unzip \
wget \
python3 \
python \
python3-pip
wget

WORKDIR /opt/xtensa

Expand All @@ -22,9 +19,6 @@ COPY ./XtensaTools_RI_2022_9_linux.tgz .
COPY ci/install_cores_xplorer_solo.sh .
COPY ci/install_bazelisk.sh .

RUN \
python3 -m pip install -U --force-reinstall pip

RUN \
pip3 install Pillow

Expand Down

0 comments on commit d027f2a

Please sign in to comment.