App dockerized

Author: Xpshnik

.env.dev

@@ -0,0 +1,7 @@
+DB_HOST=db
+DB_NAME=django_images_api_project
+DB_USER=test
+DB_PASS=test
+POSTGRES_DB=django_images_api_project
+POSTGRES_USER=test
+POSTGRES_PASSWORD=test

Dockerfile

@@ -0,0 +1,13 @@
+FROM python:alpine
+
+ENV PYTHONUNBUFFERED 1
+COPY ./requirements.txt /requirements.txt
+RUN apk add --update --no-cache postgresql-client jpeg-dev
+RUN apk add --update --no-cache --virtual .tmp-build-deps \
+    gcc libc-dev linux-headers postgresql-dev musl-dev zlib zlib-dev
+RUN pip install -r /requirements.txt
+RUN apk del .tmp-build-deps
+
+RUN mkdir /app
+COPY ./app /app
+WORKDIR /app

app/accounts/__init__.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AccountsConfig(AppConfig):
+    name = 'accounts'

accounts/admin.py renamed to app/accounts/admin.py

@@ -0,0 +1,19 @@
+import time
+from django.db import connections
+from django.db.utils import OperationalError
+from django.core.management import BaseCommand
+
+class Command(BaseCommand):
+    """Django command to pause execution until db is available"""
+
+    def handle(self, *args, **options):
+        self.stdout.write('Waiting for database...')
+        db_conn = None
+        while not db_conn:
+            try:
+                db_conn = connections['default']
+            except OperationalError:
+                self.stdout.write('Database unavailable, waititng 1 second...')
+                time.sleep(1)
+
+        self.stdout.write(self.style.SUCCESS('Database available!'))

app/accounts/apps.py

@@ -10,4 +10,4 @@ def compare(self, value, schema):
         except jsonschema.exceptions.ValidationError:
             raise ValidationError(
                 '%(value)s failed JSON schema check', params={'value': value}
-            )
+            )

app/accounts/management/__init__.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

app/accounts/management/commands/__init__.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

app/accounts/management/commands/wait_for_db.py

@@ -22,8 +22,6 @@ def make_thumbnails(sender, instance, **kwargs):
         ])
         instance._thumbnail_drafts = jobs.apply_async()
 
-    """instance.owner.tier or instance.owner.tier.thumbnail_heights changed?"""
-
 
 @receiver(post_save, sender=UploadedImage)
 def initiate_thumbnails(sender, instance, created, **kwargs):

accounts/migrations/0001_initial.py renamed to app/accounts/migrations/0001_initial.py

@@ -1,10 +1,11 @@
 from rest_framework import generics, permissions
+from rest_framework.response import Response
 from .serializers import ImageSerializer
 from .models import UploadedImage
 
 class ImageListCreateAPIView(generics.ListCreateAPIView):
     serializer_class = ImageSerializer
-    permission_classes = [permissions.IsAuthenticated]
+    permission_classes = (permissions.IsAuthenticated, )
 
     def get_queryset(self):
         return UploadedImage.objects.filter(owner=self.request.user.useraccount)

accounts/models.py renamed to app/accounts/models.py

@@ -0,0 +1,16 @@
+"""
+ASGI config for images_api_project project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/3.1/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'images_api_project.settings')
+
+application = get_asgi_application()

accounts/validators.py renamed to app/accounts/validators.py

@@ -9,7 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/3.1/ref/settings/
 """
-
+import os
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
@@ -81,15 +81,13 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'django_images_api_project',
-        'USER': 'test',
-        'PASSWORD': 'test',
-        'HOST': 'localhost',
-        'POST': '5432'
+        'HOST': os.environ.get('DB_HOST'),
+        'NAME': os.environ.get('DB_NAME'),
+        'USER': os.environ.get('DB_USER'),
+        'PASSWORD': os.environ.get('DB_PASS'),
     }
 }
 
-
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
 
@@ -131,8 +129,14 @@
 MEDIA_ROOT =  Path(BASE_DIR / 'media')
 MEDIA_URL = '/media/'
 
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': [
+        'rest_framework.authentication.BasicAuthentication',
+    ]
+}
+
 # CELERY related settings
-REDIS_HOST = 'localhost'
+REDIS_HOST = 'redis'
 REDIS_PORT = '6379'
 CELERY_BROKER_URL = 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0'
 CELERY_RESULT_BACKEND = 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0'

app/accounts/views.py

@@ -0,0 +1,16 @@
+"""
+WSGI config for images_api_project project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'images_api_project.settings')
+
+application = get_wsgi_application()

app/images_api/__init__.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'images_api_project.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()

app/images_api/admin.py

@@ -0,0 +1,39 @@
+version: '3'
+
+services:
+  app:
+    build:
+      context: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - ./app:/app
+    command: >
+      sh -c "python3 manage.py migrate &&
+             python3 manage.py wait_for_db &&
+             python3 manage.py runserver 0.0.0.0:8000"
+    env_file:
+      - ./.env.dev
+    depends_on:
+      - db
+  db:
+    image: postgres:10-alpine
+    env_file:
+      - ./.env.dev
+    ports:
+      - "5432:5432"
+  redis:
+    image: redis:alpine
+  celery:
+    restart: always
+    build:
+      context: .
+    command: celery -A images_api_project worker -l info -P solo
+    volumes:
+      - ./app:/app
+    env_file:
+      - ./.env.dev
+    depends_on:
+      - db
+      - redis
+      - app

images_api/apps.py renamed to app/images_api/apps.py

@@ -0,0 +1,7 @@
+celery==5.2.7
+Django==3.1.7
+djangorestframework==3.12.4
+jsonschema==4.5.1
+Pillow==8.4.0
+psycopg2==2.9.1
+redis==4.3.3