From a4fa5617dd9b886fbb79a87c4178335c3dd8e889 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 23 Oct 2022 11:02:20 +0100
Subject: [PATCH] Move FLASK_APP to our wrapper script
---
Dockerfile | 6 ------
feedbackloop.sh | 2 ++
feedbackloop/main.py | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4a1ef28..ca96b84 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 1bb029b..e127008 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 257d939..0ac88cc 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()
--
GitLab