modified settings and environment variables

.envs/.env.dev

@@ -1,14 +1,4 @@
-# web
-DJANGO_SETTINGS_MODULE=hex_images.settings.development
-SECRET_KEY=django-insecure-@0*hp*@)v1qpq2j&!s3+2gw7!f=kh0h$9tf_e0w4prq&=q860h
-
 # postgres
 POSTGRES_DB=hex_images
 POSTGRES_USER=hex_images
 POSTGRES_PASSWORD=UiZz91YIW5GETnX2ifoCl8BtI8wuToLS
-POSTGRES_HOST=postgres
-POSTGRES_PORT=5432
-
-# redis
-ALLOW_EMPTY_PASSWORD=no
-REDIS_PASSWORD=UiZz91YIW5GETdsfnX2ifoCl8BtI8wuToLS

.envs/.env.test

@@ -0,0 +1,16 @@
+# web
+DJANGO_SETTINGS_MODULE=hex_images.settings.development
+SECRET_KEY=django-insecure-@0*hp*@)v1qpq2j&!s3+2gw7!f=kh0h$9tf_e0w4prq&=q860h
+
+# postgres
+POSTGRES_DB=hex_images
+POSTGRES_USER=hex_images
+POSTGRES_PASSWORD=UiZz91YIW5GETnX2ifoCl8BtI8wuToLS
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
+
+# redis
+ALLOW_EMPTY_PASSWORD=no
+REDIS_PASSWORD=UiZz91YIW5GETdsfnX2ifoCl8BtI8wuToLS
+REDIS_HOST=redis
+REDIS_PORT=6379

Dockerfile

@@ -14,5 +14,3 @@ RUN pip install -r requirements/development.txt
 COPY . .
 
 LABEL maintainer="Goutom Roy" version="1.0.0"
-
-

README.md

@@ -1,4 +1,4 @@
-### Setup 
+### Setup
 **Run following commands**
 * docker-compose up -d
 * docker container exec -it hex_images__web python manage.py create_test_users
@@ -11,15 +11,15 @@
 * username: **hex_premium** password: **hex_premium_2023**
 * username: **hex_enterprise** password: **hex_enterprise_2023**
 
-### Available endpoints to use  
-**Please login to admin site before using these endpoints**  
-* http://localhost:8000/api/photos     
-* http://localhost:8000/api/photos/<pk>   
-* http://localhost:8000/api/expiring_link_view/<str:signed_link>/     
-* http://localhost:8000/api/expiring_links     
-* http://localhost:8000/api/expiring_links/<pk>        
-* http://localhost:8000/api/thumbnail_photos  
-* http://localhost:8000/media/<path>  
+### Available endpoints to use
+**Please login to admin site before using these endpoints**
+* http://localhost:8000/api/photos
+* http://localhost:8000/api/photos/<pk>
+* http://localhost:8000/api/expiring_link_view/<str:signed_link>/
+* http://localhost:8000/api/expiring_links
+* http://localhost:8000/api/expiring_links/<pk>
+* http://localhost:8000/api/thumbnail_photos
+* http://localhost:8000/media/<path>
 
 
 ### Testing command
@@ -29,4 +29,4 @@
 **93%**
 
 ### Time to finish
-It took about 28 hours to finish the project
+It took about 28 hours to finish the project

docker-compose-develope.yml

@@ -0,0 +1,29 @@
+services:
+
+  postgres:
+    image: postgres:15.3-alpine
+    container_name: hex_images__postgres
+    ports:
+      - '5432:5432'
+    volumes:
+      - /var/hex_images_service/postgres-data:/var/lib/postgresql/data
+    env_file:
+      - .envs/.env.dev
+
+    restart: always
+    networks:
+      - back-tier
+
+  redis:
+    image: redis:7.0.4-alpine
+    container_name: hex_images__redis
+    ports:
+      - '6379:6379'
+    volumes:
+      - /var/hex_images_service/redis-data:/data
+    networks:
+      - back-tier
+
+networks:
+  back-tier:
+    driver: bridge

hex_images/celery.py

@@ -3,13 +3,14 @@
 import os
 
 from celery import Celery
+from django.conf import settings
 
 # set the default Django settings module for the 'celery' program.
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "hex_images.settings.development")
 
 
 class Config:
-    broker_url = "redis://redis:6379/0"
+    broker_url = (settings.REDIS_CONNECTION_STRING,)
     result_backend = "django-db"
     beat_max_loop_interval = 600
     result_cache_max = 1000

hex_images/settings/base.py

@@ -20,7 +20,12 @@
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = os.environ.get("SECRET_KEY")
+SECRET_KEY = (
+    os.environ.get(
+        "SECRET_KEY",
+        "django-insecure-@0*hp*@)v1qpq2j&!s3+2gw7!f=kh0h$9tf_e0w4prq&=q860h",
+    ),
+)
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -87,21 +92,27 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql",
-        "NAME": os.environ.get("POSTGRES_DB"),
-        "USER": os.environ.get("POSTGRES_USER"),
-        "PASSWORD": os.environ.get("POSTGRES_PASSWORD"),
-        "HOST": os.environ.get("POSTGRES_HOST"),
-        "PORT": os.environ.get("POSTGRES_PORT"),
+        "NAME": os.environ.get("POSTGRES_DB", "hex_images"),
+        "USER": os.environ.get("POSTGRES_USER", "hex_images"),
+        "PASSWORD": os.environ.get(
+            "POSTGRES_PASSWORD", "UiZz91YIW5GETnX2ifoCl8BtI8wuToLS"
+        ),
+        "HOST": os.environ.get("POSTGRES_HOST", "localhost"),
+        "PORT": os.environ.get("POSTGRES_PORT", "5432"),
         "ATOMIC_REQUESTS": True,
         "CONN_MAX_AGE": 60 * 10,
     }
 }
 
 # Cache
+REDIS_CONNECTION_STRING = os.environ.get(
+    "REDIS_CONNECTION_STRING", "redis://localhost:6379"
+)
+
 CACHES = {
     "default": {
         "BACKEND": "django.core.cache.backends.redis.RedisCache",
-        "LOCATION": "redis://redis:6379/0",
+        "LOCATION": REDIS_CONNECTION_STRING,
     }
 }
 

hex_images/settings/development.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+
 from .base import *  # noqa
 
 # project constant
@@ -9,7 +11,7 @@
 CACHES = {
     "default": {
         "BACKEND": "django.core.cache.backends.redis.RedisCache",
-        "LOCATION": "redis://localhost:6379/0",
+        "LOCATION": settings.REDIS_CONNECTION_STRING,
     }
 }
 

hex_images/urls.py

@@ -27,3 +27,4 @@
 
 if settings.DEBUG:
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += [path("api-auth/", include("rest_framework.urls"))]