From e2721ff00edb341f879edbcae723caefdce80317 Mon Sep 17 00:00:00 2001
From: vas3k <me@vas3k.ru>
Date: Tue, 29 Mar 2022 11:03:15 +0200
Subject: [PATCH] Docker deployment: fix dockerfile

---
 Dockerfile                    | 12 ++++++++++--
 Makefile                      |  4 ----
 docker-compose.production.yml |  2 +-
 requirements.txt              |  5 ++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 181b7f0..1c038eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,28 @@
-FROM python:3.7-slim-buster
+FROM ubuntu:20.04
+ENV MODE dev
+ENV DEBIAN_FRONTEND=noninteractive
 
 ARG requirements=requirements.txt
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-    && apt-get dist-upgrade -y \
     && apt-get install --no-install-recommends -yq \
+      python3 \
+      python3-pip \
       gcc \
       libc-dev \
       libpq-dev \
       make \
+      cron \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
+COPY . /app
+COPY etc/crontab /etc/crontab
+RUN chmod 600 /etc/crontab
+
 ADD . /app
 
 RUN pip install --no-cache-dir -e . \
diff --git a/Makefile b/Makefile
index e3d6599..b4f0f92 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,6 @@ migrate:  ## Migrate database to the latest version
 mypy:  ## Check types with mypy
 	mypy $(PROJECT_NAME)
 
-run:  ## Runs dev server
-	python3 manage.py runserver
-
 telegram:
 	python3 setup_telegram.py
 
@@ -66,6 +63,5 @@ test-requirements:  ## Install requirements to run tests
   lint \
   migrate \
   mypy \
-  run \
   test-ci \
   test-requirements
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 73205d1..2879603 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   app: &app
     image: ghcr.io/vas3k/infomate:${GITHUB_SHA:-latest}
-    command: make docker-run-production
+    command: make docker-run-app
     container_name: infomate_app
     environment:
       - MODE=production
diff --git a/requirements.txt b/requirements.txt
index bc8e919..e44b444 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,10 +7,9 @@ pillow==9.0.1
 awesome-slugify>=1.6.5
 requests>=2.22.0
 beautifulsoup4==4.6.2
-pyyaml==5.2
+pyyaml==5.4
 feedparser==6
 sentry-sdk==0.14.1
-nltk==3.4.5
+nltk==3.6.6
 newspaper3k>=0.2.8
 django-bleach==1.0.0
-