From 2c297409fb2e6a2ae8c6a5a0e4197d16d5616900 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Fri, 6 Oct 2023 09:24:03 +0100
Subject: [PATCH] Run everything in a virtualenv
---
Dockerfile | 4 +---
feedbackloop.sh | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index b539e20..13feab7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,6 @@ ADD . /src
WORKDIR /src
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 \
python3-setuptools python3-pip && \
apt-get clean && \
rm -fr /var/lib/apt/lists/* && \
@@ -12,12 +11,11 @@ RUN apt-get -q update && \
FROM registry.git.autistici.org/ai3/docker/s6-overlay-lite:master
COPY --from=build /src/dist/*.whl /tmp/wheels/
COPY conf/ /etc/
-COPY feedbackloop.sh /usr/local/bin/feedbackloop
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 \
python3-setuptools python3-pip python3-virtualenv && \
apt-get clean && \
rm -fr /var/lib/apt/lists/* && \
virtualenv /virtualenv && \
cd /tmp/wheels && /virtualenv/bin/pip3 install *.whl && rm -fr /tmp/wheels
+COPY feedbackloop.sh /virtualenv/bin/feedbackloop
diff --git a/feedbackloop.sh b/feedbackloop.sh
index e127008..898b8aa 100755
--- a/feedbackloop.sh
+++ b/feedbackloop.sh
@@ -2,4 +2,4 @@
export FLASK_APP=feedbackloop.main:create_app
-exec flask "$@"
+exec /virtualenv/bin/flask "$@"
--
GitLab