Enabled Docker for Heroku

.dockerignore

@@ -0,0 +1,3 @@
+__pycache__
+*.pyc
+env/

.gitignore

@@ -210,4 +210,6 @@ dist
 .yarn/unplugged
 .yarn/build-state.yml
 .yarn/install-state.gz
-.pnp.*
+.pnp.*
+
+.env

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:3.9.5
+
+ENV PYTHONUNBUFFERED=1
+
+WORKDIR /code
+
+COPY backup/docker-requirements.txt /code/
+RUN pip install -r docker-requirements.txt
+
+COPY . /code/
+
+RUN chmod au+x release
+RUN ./release

Procfile

@@ -1,5 +1,8 @@
-release: chmod au+x release && ./release
-web: gunicorn gusbemacbe.wsgi --log-file -
+# Traditional
+# release: chmod au+x release && ./release
+# web: gunicorn gusbemacbe.wsgi --log-file -
 
 # Docker
-# worker: python manage.py rqworker default
+release: chmod au+x release && ./release
+web: gunicorn gusbemacbe.wsgi --log-file -
+worker: python manage.py rqworker default

backup/docker-requirements.txt

@@ -0,0 +1,20 @@
+asgiref==3.3.4
+dj-database-url==0.5.0
+Django==3.2.4
+django-dbbackup==3.3.0
+django-extensions==3.1.3
+django-heroku==0.3.1
+django-redis-cache==3.0.0
+django-rq==2.4.1
+django-smuggler==1.0.2
+django-sslserver==0.22
+djangorestframework==3.12.4
+forex-python==1.6
+gunicorn==20.1.0
+pandas==1.2.4
+psycopg2-binary==2.9.1
+pymdown-extensions==8.2
+python-decouple==3.4
+pytz==2021.1
+sqlparse==0.4.1
+whitenoise==5.2.0

backup/requirements.txt

@@ -1,4 +1,3 @@
-# ipychart
 dj-database-url
 Django
 # django-chartjs
@@ -11,7 +10,8 @@ django-sslserver
 djangorestframework
 forex-python
 gunicorn
-# pandas
+# ipychart
+pandas
 # psycopg2
 psycopg2-binary
 pymdown-extensions

contrib/env_gen.py

@@ -14,7 +14,7 @@
 CONFIG_STRING = """
 DEBUG = True
 SECRET_KEY = %s
-ALLOWED_HOSTS = 127.0.0.1, localhost, localhost:1984, 0.0.0.0
+ALLOWED_HOSTS = *, 127.0.0.1, localhost, localhost:1980, localhost:1984, 0.0.0.0
 
 DATABASE_URL = sqlite:https:///db.sqlite3
 # POSTGRES_DB_URL = postgres:https://USER:PASSWORD@HOST:PORT/NAME

docker-compose.yml

@@ -0,0 +1,40 @@
+version: '3.9'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - pgdata:/var/lib/postgresql/data/
+ environment:
+ - POSTGRES_DB=postgres
+ - POSTGRES_USER=postgres
+ - POSTGRES_PASSWORD=postgres
+ web:
+ build: .
+ command: python manage.py runserver 0.0.0.0:8000
+ environment:
+ DEBUG: 1
+ volumes:
+ - .:/app
+ ports:
+ - 8000:8000
+ depends_on:
+ - db
+ - redis
+
+ worker:
+ build: .
+ command: python manage.py rqworker default
+ environment:
+ DEBUG: 1
+ volumes:
+ - .:/app
+ depends_on:
+ - web
+
+ redis:
+ image: redis:latest
+
+volumes:
+ pgdata:

docker/dockerfiles/arch

@@ -1,8 +1,7 @@
 # Pull base image
 FROM archlinux/archlinux:latest
 
-# Install psql so that "python manage.py dbshell" works
-RUN yes | pacman -Syu
+RUN yes | pacman -Syyu
 
 # Set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -12,12 +11,10 @@ ENV PYTHONUNBUFFERED 1
 WORKDIR /app
 
 # Install dependencies
-RUN yes | pacman -S neofetch postgresql postgresql-libs python python-pip python-psycopg2 python-pytz tidy
-RUN neofetch
-RUN python --version
+RUN yes | pacman -S --needed gcc postgresql postgresql-libs python python-pip
 
-COPY requirements.txt /app/requirements.txt
-RUN pip install --user -r /app/requirements.txt
+COPY pyproject.toml /app/pyproject.toml
+RUN poetry install
 
 # Copy project
 COPY . /app/

gusbemacbe/settings.py

@@ -58,6 +58,7 @@
  # third-party apps
  # 'chartjs',
  'dbbackup',
+ 'django_rq',
  'django_extensions',
  'smuggler',
  'sslserver',
@@ -75,7 +76,7 @@
  'django.contrib.auth.middleware.AuthenticationMiddleware',
  'django.contrib.messages.middleware.MessageMiddleware',
  'django.middleware.clickjacking.XFrameOptionsMiddleware',
- # 'tidy.middleware.TidyMiddleware',
+ # 'tidy.middleware.TidyMiddleware'
 ]
 
 # ROOT_URLCONF = '{{ project_name }}.urls'
@@ -110,11 +111,13 @@
 # }
 # }
 
-default_dburl = 'sqlite:https:///' + str(BASE_DIR / 'db.sqlite3')
-
-DATABASES = {
- 'default': config('DATABASE_URL', default = default_dburl, cast = dburl),
-}
+# DATABASES = {
+# # If DATABASE_URL environment variable isn't set, use Docker Compose Postgres database.
+# 'default': dj_database_url.config(
+# default = 'postgres:https://postgres:postgres@db:5432/gusbemacbe',
+# conn_max_age = 600,
+# )
+# }
 
 # DATABASES = {
 # 'default': {
@@ -127,6 +130,12 @@
 # }
 # }
 
+default_dburl = 'sqlite:https:///' + str(BASE_DIR / 'db.sqlite3')
+
+DATABASES = {
+ 'default': config('DATABASE_URL', default = default_dburl, cast = dburl),
+}
+
 DBBACKUP_STORAGE = 'django.core.files.storage.FileSystemStorage'
 DBBACKUP_STORAGE_OPTIONS = {'location': 'backup/'}
 
@@ -193,6 +202,27 @@
 # Add configuration for static files storage using whitenoise
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 
+# Configure Redis cache and Django-RQ.
+
+# https://django-redis-cache.readthedocs.io/en/latest/intro_quick_start.html#quick-start
+CACHES = {
+ 'default': {
+ 'BACKEND': 'redis_cache.RedisCache',
+ # By default use Docker Compose Redis instance.
+ 'LOCATION': os.getenv('REDIS_URL', 'redis:6379'),
+ },
+}
+
+# https://github.com/rq/django-rq#support-for-django-redis-and-django-redis-cache
+RQ_QUEUES = {
+ 'default': {
+ 'USE_REDIS_CACHE': 'default',
+ 'DEFAULT_TIMEOUT': 360,
+ },
+}
+
+RQ_SHOW_ADMIN_LINK = True
+
 # Default primary key field type
 # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

gusbemacbe/urls.py

@@ -28,6 +28,7 @@
  path('admin/', include('smuggler.urls')), # before admin url patterns!
  path('', home_view, name = 'home'),
  path('admin/', admin.site.urls),
+ path('django-rq/', include('django_rq.urls')),
 
  # Pages
  path('aparecida-covid-19-tracker/', include('AparecidaCovidTracker.urls')),

heroku.yml

@@ -0,0 +1,3 @@
+build:
+ docker:
+ web: Dockerfile