From ca1aa1f70f0314c5f35a8f91700ead08418f982e Mon Sep 17 00:00:00 2001 From: Jim Fingal Date: Sat, 7 Nov 2020 18:25:17 -0800 Subject: [PATCH 1/2] Run docker flower in the main container for consistency --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 640b2ecb..18b58032 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,7 +57,8 @@ services: - redis restart: on-failure flower: - image: mher/flower + build: . + command: flower --port=8888 env_file: .env environment: - CELERY_BROKER_URL=${CELERY_BROKER} From 3056441b5015c0280bdef200a5e7fd0ac8714af9 Mon Sep 17 00:00:00 2001 From: Jim Fingal Date: Sat, 7 Nov 2020 18:25:31 -0800 Subject: [PATCH 2/2] Pin Python 3.9 and give dockerfile a little breathing room --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f03d84dd..7456996e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,15 @@ -FROM python:3 -ENV PYTHONUNBUFFERED 1 +FROM python:3.9 + +ENV PYTHONUNBUFFERED 1 + RUN mkdir /app RUN mkdir /app/static RUN mkdir /app/images + WORKDIR /app + COPY requirements.txt /app/ RUN pip install -r requirements.txt + COPY ./bookwyrm /app COPY ./celerywyrm /app