Skip to content

Commit

Permalink
updated to work with Apprise v1.4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
caronc committed Jul 8, 2023
1 parent 35553a9 commit e9886c4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
15 changes: 9 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG ARCH
FROM ${ARCH}python:3.10-slim
FROM ${ARCH}python:3.11-slim

# set version label
ARG BUILD_DATE
Expand All @@ -14,14 +14,17 @@ ENV APPRISE_CONFIG_DIR /config
ENV APPRISE_ATTACH_DIR /attach
ENV APPRISE_PLUGIN_PATHS /plugin

# Install nginx and supervisord
# Install nginx, supervisord, and cryptography dependencies
RUN apt-get update -qq && \
apt-get install -y -qq nginx supervisor build-essential libffi-dev libssl-dev \
pkg-config python-dev rustc
apt-get install -y -qq nginx supervisor \
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
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 apprise_api/static /usr/share/nginx/html/s/
Expand All @@ -33,7 +36,7 @@ WORKDIR /opt/apprise
COPY apprise_api/ webapp

# 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 autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django
apprise == 1.4.0
apprise == 1.4.5
gunicorn

# 3rd party service support
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py310,coverage-report
envlist = py311,coverage-report
skipsdist = true

[testenv]
Expand All @@ -14,7 +14,7 @@ commands =
coverage run --parallel -m pytest {posargs} apprise_api
flake8 apprise_api --count --show-source --statistics

[testenv:py310]
[testenv:py311]
deps=
-r{toxinidir}/requirements.txt
-r{toxinidir}/dev-requirements.txt
Expand Down

0 comments on commit e9886c4

Please sign in to comment.