updated to work with Apprise v1.4.5

This commit is contained in:
Chris Caron 2023-07-06 21:38:15 -04:00
parent 35553a9f0a
commit e9886c4c77
4 changed files with 13 additions and 10 deletions

View File

@ -36,7 +36,7 @@ jobs:
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7 platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }} push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }} tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }} labels: ${{ steps.docker_meta.outputs.labels }}

View File

@ -1,5 +1,5 @@
ARG ARCH ARG ARCH
FROM ${ARCH}python:3.10-slim FROM ${ARCH}python:3.11-slim
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@ -14,14 +14,17 @@ ENV APPRISE_CONFIG_DIR /config
ENV APPRISE_ATTACH_DIR /attach ENV APPRISE_ATTACH_DIR /attach
ENV APPRISE_PLUGIN_PATHS /plugin ENV APPRISE_PLUGIN_PATHS /plugin
# Install nginx and supervisord # Install nginx, supervisord, and cryptography dependencies
RUN apt-get update -qq && \ RUN apt-get update -qq && \
apt-get install -y -qq nginx supervisor build-essential libffi-dev libssl-dev \ apt-get install -y -qq nginx supervisor \
pkg-config python-dev rustc build-essential libffi-dev libssl-dev cargo pkg-config python3-dev rustc
# Cryptography documents that the latest version of pip3 must always be used
RUN pip3 install --upgrade pip
# Install requirements and gunicorn # Install requirements and gunicorn
COPY ./requirements.txt /etc/requirements.txt COPY ./requirements.txt /etc/requirements.txt
RUN pip3 install -q -r /etc/requirements.txt gunicorn RUN pip3 install --no-cache-dir -q -r /etc/requirements.txt gunicorn --no-binary cryptography
# Copy our static content in place # Copy our static content in place
COPY apprise_api/static /usr/share/nginx/html/s/ COPY apprise_api/static /usr/share/nginx/html/s/
@ -33,7 +36,7 @@ WORKDIR /opt/apprise
COPY apprise_api/ webapp COPY apprise_api/ webapp
# Cleanup # Cleanup
RUN apt-get remove -y -qq build-essential libffi-dev libssl-dev python-dev rustc pkg-config && \ RUN apt-get remove -y -qq build-essential libffi-dev libssl-dev python3-dev cargo rustc pkg-config && \
apt-get clean autoclean && \ apt-get clean autoclean && \
apt-get autoremove --yes && \ apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/ rm -rf /var/lib/{apt,dpkg,cache,log}/

View File

@ -1,5 +1,5 @@
django django
apprise == 1.4.0 apprise == 1.4.5
gunicorn gunicorn
# 3rd party service support # 3rd party service support

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py310,coverage-report envlist = py311,coverage-report
skipsdist = true skipsdist = true
[testenv] [testenv]
@ -14,7 +14,7 @@ commands =
coverage run --parallel -m pytest {posargs} apprise_api coverage run --parallel -m pytest {posargs} apprise_api
flake8 apprise_api --count --show-source --statistics flake8 apprise_api --count --show-source --statistics
[testenv:py310] [testenv:py311]
deps= deps=
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/dev-requirements.txt -r{toxinidir}/dev-requirements.txt