Merge pull request #660 from thorrak/pyzmq

Update base image for pyzmq
thorrak · Dec 16, 2021 · 6e08f25 · 6e08f25
2 parents 5719c02 + 6a05756
commit 6e08f25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/docker-hub-test.yml b/.github/workflows/docker-hub-test.yml
@@ -3,7 +3,7 @@ name: 'Build & Push to Docker Hub'
 on:
   push:
     branches:
-      - no_bluez
+      - pyzmq
 
 jobs:
   buildx:
@@ -37,4 +37,4 @@ jobs:
           --platform=linux/arm/v7,linux/amd64,linux/i386 \
           --output "type=image,push=true" \
           --file ./compose/production/django/Dockerfile . \
-          --tag jdbeeler/fermentrack:nobluez
+          --tag jdbeeler/fermentrack:testing
diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile
@@ -1,5 +1,5 @@
 
-FROM python:3.8-buster
+FROM python:3.9-bullseye
 
 ENV PYTHONUNBUFFERED 1
 
@@ -62,7 +62,7 @@ RUN chown django /app/data/
 RUN chown django /app/log/
 
 # Fix Bluetooth permissions
-RUN setcap cap_net_raw,cap_net_admin+eip /usr/local/bin/python3.8
+RUN setcap cap_net_raw,cap_net_admin+eip /usr/local/bin/python3.9
 
 USER django
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -2,7 +2,7 @@ Django==3.0.14
 configobj       # required by brewpi.py
 
 #pyzmq~=19.0.1 --no-binary=pyzmq  # The wheel for pyzmq periodically has issues for Raspbian installs
-pyzmq==19.0.2    # Fingers crossed the wheel works
+pyzmq==22.3.0    # Fingers crossed the wheel works
 # numpy==1.18.4 --no-binary=numpy  # The wheel for numpy also has issues (at least on Stretch)
 
 pytz==2020.4           # required by manage.py migrate