updating toxic (#34)

Author: thirtytwobits

README.md

@@ -77,6 +77,7 @@ is based on Ubuntu and provides all modern Python3 distributions, pip, tox, and
 | tag      | Base Python | Python Versions | Tox | Nox | pip | Other Utilities |
 |----------|-------------|-----------------|-----|-----|-----|-----------------|
 | [tx20.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toxic) | 3.8 | 3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12 | 4.4.5 | (not available) | 20.0.2 | <ul><li>sonar-scanner</li></ul> |
+| [tx22.4.1](https://github.com/OpenCyphal/docker_toolchains/pkgs/container/toxic) | 3.8 | 3.7, 3.8, 3.9, 3.10, 3.11, 3.12 | 4.4.5 | (not available) | 20.0.2 | |
 
 You can use this in your workflow yaml like this:
 

toxic/Dockerfile

@@ -1,7 +1,7 @@
 #
-# Builds a docker image to use for tox runs.
+# Builds a docker image to use for development and CI.
 #
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 LABEL org.opencontainers.image.description "Provides a consistent build and test environment for development, continuous-integration, and test automation of OpenCyphal Python based projects."
 
@@ -14,14 +14,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get -y install apt-utils && apt-get -y install locales
 RUN locale-gen en_US.UTF-8
 
-ENV SONAR_SCANNER_VERSION 4.8.0.2856
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
-ENV SONAR_SCANNER_HOME=/sonar-scanner-${SONAR_SCANNER_VERSION}-linux
-ENV SONAR_SCANNER_OPTS="-server"
-
-ENV PATH="${SONAR_SCANNER_HOME}/sonar-scanner-${SONAR_SCANNER_VERSION}-linux/bin:${PATH}"
 
 COPY provision.sh /
 

toxic/README.md

@@ -7,8 +7,8 @@ for development, continuous-integration, and test automation of Python based pro
 
 To release a new build of this container simply create a [new github release](https://github.com/OpenCyphal/docker_toolchains/releases/new)
 that starts with `tx`, uses the Ubuntu major and minor version, and uses an monotonically increasing "patch" version.
-For example `tx20.4.1`will cause the Github workflow to rebuild and push the `opencyphal/toxic` container with the
-tag `tx20.4.1`.
+For example `tx22.4.1`will cause the Github workflow to rebuild and push the `opencyphal/toxic` container with the
+tag `tx22.4.1`.
 
 ***PLEASE UPDATE THE TOP-LEVEL README.md FOR EACH NEW RELEASE***
 
@@ -32,19 +32,19 @@ echo $FGP | docker login ghcr.io -u (github username) --password-stdin
 ... now build (where x is the next version number for the container):
 
 ```bash
-docker build -t ghcr.io/opencyphal/toxic:tx20.4.x .
+docker build -t ghcr.io/opencyphal/toxic:tx22.4.x .
 ```
 
 ... and finally, push.
 
 ```bash
-docker push ghcr.io/opencyphal/toxic:tx20.4.x
+docker push ghcr.io/opencyphal/toxic:tx22.4.x
 ```
 
 ## Testing out the container
 
 To login to an interactive session do:
 
 ```bash
-docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toxic:tx20.4.x
+docker run --rm -it -v ${PWD}:/repo ghcr.io/opencyphal/toxic:tx22.4.x
 ```

toxic/provision.sh

@@ -28,23 +28,26 @@ apt-get -y install unzip
 # deadsnakes maintains a bunch of python versions for Ubuntu.
 add-apt-repository -y ppa:deadsnakes/ppa
 apt-get update
-apt-get -y install python3.6
+apt-get -y install python3.10
+apt-get -y install python3-pip
+
 apt-get -y install python3.7
+apt-get -y install python3.7-distutils
 apt-get -y install python3.8
+apt-get -y install python3.8-distutils
 apt-get -y install python3.9
-apt-get -y install python3.10
+apt-get -y install python3.9-distutils
 apt-get -y install python3.11
+apt-get -y install python3.11-distutils
 apt-get -y install python3.12
-apt-get -y install python3-pip
-pip3 install tox
+apt-get -y install python3.12-distutils
 
-# Sonarqube
-curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
-unzip -o $HOME/.sonar/sonar-scanner.zip -d $SONAR_SCANNER_HOME
 
-rm -rf $HOME/.sonar
+pip3 install tox
+pip3 install nox
 
 echo "export PATH=$PATH" >> ~/.bashrc
 echo "export LANG=en_US.UTF-8" >> ~/.bashrc
 echo "export LANGUAGE=en_US:en" >> ~/.bashrc
 echo "export LC_ALL=en_US.UTF-8" >> ~/.bashrc
+echo "alias la=\"ls -lah\"" >> ~/.bashrc