Skip to content
Snippets Groups Projects
Commit 77799f9d authored by ale's avatar ale
Browse files

Try a different multi-stage Dockerfile approach

The current Dockerfile fails to produce a valid image, there's an odd
bug where we are pushing what looks like an intermediate to the registry.
parent a5e62291
No related branches found
No related tags found
No related merge requests found
FROM registry.git.autistici.org/ai3/docker/s6-base:master AS fbl-base FROM debian:bullseye-slim AS build
ADD . /src
WORKDIR /src
RUN apt-get -q update && \ RUN apt-get -q update && \
env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \ env DEBIAN_FRONTEND=noninteractive apt-get -qy install --no-install-recommends \
python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-cheroot \ python3-flask python3-sqlalchemy python3-flask-sqlalchemy python3-cheroot \
python3-setuptools python3-pip && \ python3-setuptools python3-pip && \
apt-get clean && \ apt-get clean && \
rm -fr /var/lib/apt/lists/* rm -fr /var/lib/apt/lists/* && \
python3 setup.py bdist_wheel
FROM fbl-base AS build
ADD . /src
WORKDIR /src
RUN python3 setup.py bdist_wheel
FROM fbl-base FROM registry.git.autistici.org/ai3/docker/s6-base:master
COPY --from=build /src/dist/*.whl /tmp/wheels/ COPY --from=build /src/dist/*.whl /tmp/wheels/
COPY conf/ /etc/ COPY conf/ /etc/
COPY feedbackloop.sh /usr/local/bin/feedbackloop COPY feedbackloop.sh /usr/local/bin/feedbackloop
RUN cd /tmp/wheels && pip3 install *.whl && rm -fr /tmp/wheels 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/* && \
cd /tmp/wheels && pip3 install *.whl && rm -fr /tmp/wheels
FROM registry.git.autistici.org/ai3/docker/s6-base:master AS fbl-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 \
python3-setuptools python3-pip && \
apt-get clean && \
rm -fr /var/lib/apt/lists/*
FROM fbl-base AS build
ADD . /src
WORKDIR /src
RUN python3 setup.py bdist_wheel
FROM fbl-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
...@@ -6,6 +6,6 @@ class FeedbackEntry(db.Model): ...@@ -6,6 +6,6 @@ class FeedbackEntry(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
sender = db.Column(db.Text, index=True) sender = db.Column(db.Text, index=True)
reporter = db.Column(db.Text) reporter = db.Column(db.Text)
is_list = db.Column(db.Boolean) is_list = db.Column(db.Boolean, index=True)
message = db.Column(db.Text) message = db.Column(db.Text)
timestamp = db.Column(db.DateTime) timestamp = db.Column(db.DateTime)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment