From 3090998c227e4a2ce9fdaa2dfd24f98be3350e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bal=C3=A1zs=20Eszes?= Date: Sat, 17 Feb 2024 21:12:28 +0100 Subject: [PATCH] Including `pip` in the image (#4) * Downgrading to Ubuntu 22 and Python 3.10 --- Dockerfile | 23 ++++++++++++++--------- README.md | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed56554..cb9421b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:23.04 +FROM ubuntu:22.04 -LABEL version="1.1.0" +LABEL version="1.3.0" LABEL description="Image for building ARM embedded projects" # Install common tools @@ -11,7 +11,18 @@ RUN apt-get install -y \ curl \ wget \ libboost-all-dev \ - libtool + libtool \ + software-properties-common + +RUN add-apt-repository ppa:deadsnakes/ppa +RUN apt-get update && \ + apt-get install -y python3.10 python3.10-distutils && \ + apt-get install -y python3.10-venv python3.10-dev && \ + apt-get install -y python3-pip + +RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 1 && \ + update-alternatives --set python3 /usr/bin/python3.10 && \ + ln -s /usr/bin/python3.10 /usr/bin/python # Install SRecord ARG srecord_version="1.65" @@ -30,12 +41,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v${cmake_version}/cm RUN sh cmake-${cmake_version}-${cmake_platform}.sh --prefix=/opt/cmake --skip-license ENV PATH "$PATH:/opt/cmake/bin" -# Install Python -WORKDIR / -RUN apt-get install -y python3.11 -RUN echo 'alias python="python3.11"' >> ~/.bashrc -RUN echo 'alias python3="python3.11"' >> ~/.bashrc - # Install ARM GCC ARG arm_archive="13.2.rel1" ARG arm_version="13.2.rel1" diff --git a/README.md b/README.md index e6a47fa..db278ea 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Tools + CMake 3.28.1 -+ Python 3.11.4 ++ Python 3.10 + GCC 9.0 + ARM GCC 13.2-rel1 + SRecord 1.65