Workflow updated to handle cryptography dependency (#42)

This commit is contained in:
Chris Caron 2021-02-23 19:39:02 -05:00
parent 9f30e2d748
commit 54644df898
2 changed files with 10 additions and 7 deletions

View File

@ -8,6 +8,7 @@ on:
jobs:
buildx:
# Fixing build of ubuntu for rust/cryptography compatibility
runs-on: ubuntu-18.04
steps:
- name: Checkout
@ -17,7 +18,8 @@ jobs:
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v1
with:
images: ${{ secrets.DOCKER_HUB_REPO }}
images: ${{ secrets.DOCKER_IMAGE }}
tag-edge: true
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
@ -28,14 +30,14 @@ jobs:
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_PASSWORD }}
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
platforms: linux/amd64,linux/386,linux/arm64
platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v6,linux/arm/v7
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}

View File

@ -11,14 +11,15 @@ LABEL maintainer="Chris-Caron"
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
ENV APPRISE_CONFIG_DIR /config
ENV CRYPTOGRAPHY_DONT_BUILD_RUST=1
# Install nginx and supervisord
RUN apt-get update -qq && \
apt-get install -y -qq nginx supervisor build-essential libffi-dev libssl-dev python-dev rustc
apt-get install -y -qq nginx supervisor build-essential libffi-dev libssl-dev python-dev
# Install requirements and gunicorn
COPY ./requirements.txt /etc/requirements.txt
RUN pip3 install -qq -r /etc/requirements.txt gunicorn
RUN pip3 install -q -r /etc/requirements.txt gunicorn
# Nginx configuration
RUN echo "daemon off;" >> /etc/nginx/nginx.conf
@ -40,7 +41,7 @@ COPY apprise_api/ webapp
RUN sed -i -e 's/:8000/:8080/g' /opt/apprise/webapp/gunicorn.conf.py
# Cleanup
RUN apt-get remove -y -qq build-essential libffi-dev libssl-dev python-dev rustc && \
RUN apt-get remove -y -qq build-essential libffi-dev libssl-dev python-dev && \
apt-get clean autoclean && \
apt-get autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/