From b0b257679722970cafb6cfa8fbc127327d9dc478 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 18 Oct 2023 15:27:16 -0400 Subject: [PATCH 1/4] Upgrade to the latest version of Python 3.11 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 --- Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b0363e5..5fc5cd6 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: From 82a754cb6a468f570cb506c29916e16503c0efe0 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 18 Oct 2023 16:38:20 -0400 Subject: [PATCH 2/4] Install cmake The installation of cmake appears to now be required to build some of the pip dependencies that get pulled in (particularly ninja). --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 5fc5cd6..6f45ce0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN groupadd --system --gid ${CISA_GID} ${CISA_GROUP} \ ### ENV DEPS \ build-essential \ + cmake \ curl \ git \ libc6-dev \ From a6724367c89bfdc492f285f0384c04f46895cdc0 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 18 Oct 2023 21:51:25 -0400 Subject: [PATCH 3/4] Install libblas-dev and liblapack-dev The installation of numpy appears to now require the BLAS and LAPACK libraries. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6f45ce0..cdd184b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,8 +47,10 @@ ENV DEPS \ cmake \ curl \ git \ + libblas-dev \ libc6-dev \ libfontconfig1 \ + liblapack-dev \ libreadline-dev \ libssl-dev \ libxml2-dev \ From c2e45fd76e4399793a6e94bb7108f6a08417808a Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 19 Oct 2023 09:27:16 -0400 Subject: [PATCH 4/4] Bump version from 1.5.2 to 1.5.3 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) 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"