Merge pull request #120 from cisagov/bugfix/fix-failing-build

Fix failing build

Dockerfile

@@ -42,8 +42,7 @@ RUN groupadd --system --gid ${CISA_GID} ${CISA_GROUP} \
 # Install dependencies are only needed for software installation and
 # will be removed at the end of the build process.
 ###
-ENV DEPS \
-    build-essential \
+ENV DEPS="build-essential \
     cmake \
     curl \
     git \
@@ -86,7 +85,7 @@ ENV DEPS \
     lmodern \
     texlive-science \
     fontconfig \
-    redis-tools
+    redis-tools"
 # ENV INSTALL_DEPS \
 #     git
 RUN apt-get install --quiet --quiet --yes \
@@ -116,11 +115,13 @@ RUN tlmgr init-usertree
 # slightly longer install times.
 #
 # numpy seems to be required to build basemap's wheel, so we'll
-# install it first.
+# install it first.  Note that numpy>=2 lacks the numpy/noprefix.h
+# header required when building the wheel for matplotlib~=2.2.3, so we
+# have to pin numpy to <2.
 #
 # Note that matplotlib.basemap is currently incompatible with
 # matplotlib 3.x.
-RUN pip3 install --no-cache-dir --upgrade numpy \
+RUN pip3 install --no-cache-dir --upgrade "numpy<2" \
     && pip3 install --no-cache-dir --upgrade \
     boto3 \
     chevron \

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.5
+docker run cisagov/trustymail_reporter:1.5.6
 ```
 
 ### Running with Docker Compose ###
@@ -43,7 +43,7 @@ docker run cisagov/trustymail_reporter:1.5.5
 
     services:
       trustymail_reporter:
-        image: cisagov/trustymail_reporter:1.5.5
+        image: cisagov/trustymail_reporter:1.5.6
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -102,7 +102,7 @@ environment variables.  See the
 
     services:
       trustymail_reporter:
-        image: cisagov/trustymail_reporter:1.5.5
+        image: cisagov/trustymail_reporter:1.5.6
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -141,7 +141,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/trustymail_reporter:1.5.5
+    docker pull cisagov/trustymail_reporter:1.5.6
     ```
 
 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.5`).
+`:1.5.6`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/trustymail_reporter:1.5.5`| An exact release version. |
+|`cisagov/trustymail_reporter:1.5.6`| 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.5 \
+  --tag cisagov/trustymail_reporter:1.5.6 \
   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.5 .
+      --tag cisagov/trustymail_reporter:1.5.6 .
     ```
 
 ## Contributing ##

src/version.txt

@@ -1 +1 @@
-__version__ = "1.5.5"
+__version__ = "1.5.6"