Commit 2a287694 authored by Daniel Schreiber's avatar Daniel Schreiber

Merge branch 'master' into 'django22'

# Conflicts:
#   docker/Dockerfile
parents 106f21ce 1f61def3
Pipeline #34173 passed with stage
in 31 seconds
FROM debian:buster
RUN apt-get update && apt-get -y upgrade
RUN apt-get install -y uwsgi python3.7 uwsgi-plugin-python3 python3-venv git libpq-dev libmariadb-dev libev-dev
RUN apt-get install -y uwsgi python3.7 uwsgi-plugin-python3 python3-venv git libpq-dev libmariadb-dev libmariadb-dev-compat gcc python3-dev libev-dev
COPY install.sh /tmp/install.sh
COPY frms.ini /etc/uwsgi/apps-enabled
COPY startsync.sh /var/www/django/frms/startsync.sh
......
......@@ -9,6 +9,7 @@ source $TARGET/env/bin/activate
cd $TARGET/app
pip install -r requirements.txt
pip install ipython
pip install mysqlclient
mkdir -p $TARGET/static
chown www-data: $TARGET/static
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment