Adding Python 3.9 to toxic (#12)

Author: thirtytwobits

toxic/Dockerfile

@@ -1,12 +1,16 @@
 #
 # Builds a docker image to use for tox runs.
 #
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 VOLUME /repo
 
 WORKDIR /repo
 
+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.2.0.1873
 ENV LANG=en_US.UTF-8

toxic/README.md

@@ -15,27 +15,27 @@ docker build .
 docker images
 
 REPOSITORY      TAG            IMAGE ID
-toxic           latest         d7ab132649d6
+<none>          <none>         d7ab132649d6
 ```
 ```
 # We use the range of python environments supported as the version tag.
-docker tag d7ab132649d6 uavcan/toxic:py35-py38-sq
+docker tag d7ab132649d6 uavcan/toxic:py35-py39-sq
 docker login --username=yourhubusername
-docker push uavcan/toxic:py35-py38-sq
+docker push uavcan/toxic:py35-py39-sq
 ```
 
 ## Testing out the container
 
 Start an interactive session:
 
 ```bash
-docker run --rm -it -v ${PWD}:/repo uavcan/toxic:py35-py38-sq
+docker run --rm -it -v ${PWD}:/repo uavcan/toxic:py35-py39-sq
 ```
 
 On macintosh you'll probably want to optimize osxfs with something like cached or delegated:
 
 ```bash
-docker run --rm -it -v ${PWD}:/repo:delegated uavcan/toxic:py35-py38-sq
+docker run --rm -it -v ${PWD}:/repo:delegated uavcan/toxic:py35-py39-sq
 ```
 
 See ["Performance tuning for volume mounts"](https://docs.docker.com/docker-for-mac/osxfs-caching/) for details.
@@ -49,10 +49,10 @@ services:
   - docker
 
 before_install:
-- docker pull uavcan/toxic:py35-py38-sq
+- docker pull uavcan/toxic:py35-py39-sq
 
 script:
-- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/uavcan/toxic:py35-py38-sq /bin/sh -c tox
+- docker run --rm -v $TRAVIS_BUILD_DIR:/repo uavcan/uavcan/toxic:py35-py39-sq /bin/sh -c tox
 
 ```
 
@@ -66,7 +66,7 @@ Example pipeline.yml:
     plugins:
       - docker#v3.5.0:
           workdir: /repo
-          image: "uavcan/toxic:py35-py38-sq"
+          image: "uavcan/toxic:py35-py39-sq"
           propagate-environment: true
           mount-ssh-agent: true
 ```

toxic/provision.sh

@@ -19,17 +19,6 @@ set -o errexit
 set -o pipefail
 
 # +----------------------------------------------------------+
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get update
-
-# setup locales in the container so Python can default to utf-8.
-apt-get -y install locales
-# from http://jaredmarkell.com/docker-and-locales/
-locale-gen en_US.UTF-8
-export ENV LANG=en_US.UTF-8
-export ENV LANGUAGE=en_US:en
-export ENV LC_ALL=en_US.UTF-8
 
 apt-get -y install software-properties-common
 apt-get -y install git
@@ -43,6 +32,7 @@ apt-get -y install python3.5
 apt-get -y install python3.6
 apt-get -y install python3.7
 apt-get -y install python3.8
+apt-get -y install python3.9
 apt-get -y install python3-pip
 pip3 install tox