From 1af9221feb18c49512b471fa29599ad5a4ac30d7 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 22 Oct 2022 19:54:10 +0100
Subject: [PATCH] Simplify build process and fix scripts for Flask 1 compat
Debian has still Flask 1 in stable.
---
Dockerfile | 21 +++++++++++++++------
feedbackloop.sh | 2 +-
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index e6d4272..e77c3b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,24 @@
-FROM registry.git.autistici.org/ai3/docker/s6-base:master
+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-setuptools ca-certificates && \
+ python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-cheroot \
+ python3-setuptools python3-pip && \
apt-get clean && \
rm -fr /var/lib/apt/lists/*
-ADD . /tmp/src
-WORKDIR /tmp/src
-RUN python3 setup.py install
+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
diff --git a/feedbackloop.sh b/feedbackloop.sh
index 2f9dc38..1bb029b 100755
--- a/feedbackloop.sh
+++ b/feedbackloop.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-exec flask --app feedbackloop.main "$@"
+exec flask "$@"
--
GitLab