diff --git a/Dockerfile b/Dockerfile index b0363e5..cdd184b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,11 @@ -FROM python:3.11.5-bullseye +# We can't upgrade to Python 3.12 right now because matplotlib uses +# configparser.SafeConfigParser, but as of Python 3.12 that object has +# been removed from the configparser library. Hence we are stuck at +# 3.11 until we can upgrade matplotlib. +# +# For more information: +# https://github.com/python/cpython/blob/3.12/Lib/configparser.py +FROM python:3.11.6-bullseye ### # For a list of pre-defined annotation keys and value types see: @@ -37,10 +44,13 @@ RUN groupadd --system --gid ${CISA_GID} ${CISA_GROUP} \ ### ENV DEPS \ build-essential \ + cmake \ curl \ git \ + libblas-dev \ libc6-dev \ libfontconfig1 \ + liblapack-dev \ libreadline-dev \ libssl-dev \ libxml2-dev \ diff --git a/README.md b/README.md index 6cbfe53..b4c19ff 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ expects the secrets in a different location. To run the `cisagov/trustymail_reporter` image via Docker: ```console -docker run cisagov/trustymail_reporter:1.5.2 +docker run cisagov/trustymail_reporter:1.5.3 ``` ### Running with Docker Compose ### @@ -43,7 +43,7 @@ docker run cisagov/trustymail_reporter:1.5.2 services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.2 + image: cisagov/trustymail_reporter:1.5.3 volumes: - type: bind source: @@ -102,7 +102,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/trustymail_reporter:1.5.2 + image: cisagov/trustymail_reporter:1.5.3 volumes: - type: bind source: @@ -141,7 +141,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/trustymail_reporter:1.5.2 + docker pull cisagov/trustymail_reporter:1.5.3 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -151,11 +151,11 @@ environment variables. See the The images of this container are tagged with [semantic versions](https://semver.org) of the underlying example project that they containerize. It is recommended that most users use a version tag (e.g. -`:1.5.2`). +`:1.5.3`). | Image:tag | Description | |-----------|-------------| -|`cisagov/trustymail_reporter:1.5.2`| An exact release version. | +|`cisagov/trustymail_reporter:1.5.3`| An exact release version. | |`cisagov/trustymail_reporter:1.5`| The most recent release matching the major and minor version numbers. | |`cisagov/trustymail_reporter:1`| The most recent release matching the major version number. | |`cisagov/trustymail_reporter:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -220,7 +220,7 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --tag cisagov/trustymail_reporter:1.5.2 \ + --tag cisagov/trustymail_reporter:1.5.3 \ https://github.com/cisagov/trustymail_reporter.git#develop ``` @@ -251,7 +251,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/trustymail_reporter:1.5.2 . + --tag cisagov/trustymail_reporter:1.5.3 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 5197c5f..a06ff4e 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.2" +__version__ = "1.5.3"