diff --git a/Dockerfile b/Dockerfile index 4a1ef28c8e4919951e0871febf36ca288bdc1974..ca96b8463eca2ea471512d56f72355be318e43e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM registry.git.autistici.org/ai3/docker/s6-base:master AS base - RUN apt-get -q update && \ env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \ python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-cheroot \ @@ -8,17 +7,12 @@ RUN apt-get -q update && \ rm -fr /var/lib/apt/lists/* FROM base AS build - ADD . /src WORKDIR /src RUN python3 setup.py bdist_wheel FROM base - COPY --from=build /src/dist/*.whl /tmp/wheels/ COPY conf/ /etc/ COPY feedbackloop.sh /usr/local/bin/feedbackloop - RUN cd /tmp/wheels && pip3 install *.whl && rm -fr /tmp/wheels - -ENV FLASK_APP=feedbackloop.main:create_app diff --git a/feedbackloop.sh b/feedbackloop.sh index 1bb029b768c6c2259a36bf529842cdb5ce143742..e127008802d4414653b163c7dd6b58fed63dff22 100755 --- a/feedbackloop.sh +++ b/feedbackloop.sh @@ -1,3 +1,5 @@ #!/bin/sh +export FLASK_APP=feedbackloop.main:create_app + exec flask "$@" diff --git a/feedbackloop/main.py b/feedbackloop/main.py index 257d9392b48af2c4d1d6d2fb42bb7fa57013d18d..0ac88cccb328e4f4d6e96e065cd5af3047b3375f 100644 --- a/feedbackloop/main.py +++ b/feedbackloop/main.py @@ -45,7 +45,7 @@ def expire(days): with app.app_context(): FeedbackEntry.query.filter( FeedbackEntry.timestamp < cutoff - ).delete() + ).delete() db.session.commit()