Merge pull request #43 from snh/bullseye

Bump base to bullseye

.github/workflows/container.yml

@@ -48,7 +48,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v7
+          platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v6, linux/arm/v7
           cache-from: type=local,src=/tmp/buildx-cache
           cache-to: type=local,dest=/tmp/buildx-cache-new,mode=max
           push: ${{ github.event_name != 'pull_request' }}

Dockerfile

@@ -1,7 +1,7 @@
 # -------------------
 # The build container
 # -------------------
-FROM python:3.7-buster AS build
+FROM python:3.9-bullseye AS build
 
 # Upgrade base packages.
 RUN apt-get update && \
@@ -35,7 +35,7 @@ RUN unzip /root/cusf_predictor_wrapper-master.zip -d /root && \
 # -------------------------
 # The application container
 # -------------------------
-FROM python:3.7-slim-buster
+FROM python:3.9-slim-bullseye
 EXPOSE 5001/tcp
 
 # Upgrade base packages and install application dependencies.

chasemapper/__init__.py

@@ -8,4 +8,4 @@
 
 # Now using Semantic Versioning (https://semver.org/)  MAJOR.MINOR.PATCH
 
-__version__ = "1.4.2"
+__version__ = "1.4.3"

horusmapper.py

@@ -1262,11 +1262,21 @@ if __name__ == "__main__":
         "Starting Chasemapper Server on: http://%s:%d/"
         % (chasemapper_config["flask_host"], chasemapper_config["flask_port"])
     )
-    socketio.run(
-        app,
-        host=chasemapper_config["flask_host"],
-        port=chasemapper_config["flask_port"],
-    )
+    try:
+        socketio.run(
+            app,
+            host=chasemapper_config["flask_host"],
+            port=chasemapper_config["flask_port"],
+            allow_unsafe_werkzeug=True
+        )
+    except TypeError as e:
+        print(e)
+        logging.debug("Not using allow_unsafe_werkzeug argument.")
+        socketio.run(
+            app,
+            host=chasemapper_config["flask_host"],
+            port=chasemapper_config["flask_port"]
+        ) 
 
     # Close the predictor and data age monitor threads.
     predictor_thread_running = False

requirements.txt

@@ -1,7 +1,7 @@
 --no-binary eccodes
 cusfpredict
-flask==2.2.2
-flask-socketio==5.2.0
+flask
+flask-socketio
 lxml
 numpy
 python-dateutil