Merge branch 'main' of github.com:divio/getting-started-with-django

# Conflicts:
#	requirements.in

Author: FinalAngel

Dockerfile

@@ -14,9 +14,9 @@ RUN apt-get update && \
 # Copy only the requirements.in and .env.local files into the container
 COPY requirements.in /app/
 
-# Install pip-tools
-RUN pip install --upgrade pip && \
-    pip install pip-tools
+# Install pip-tools with compatible pip version
+RUN pip install --upgrade "pip<25" && \
+    pip install "pip-tools==7.5.1"
 
 # Compile requirements.in to requirements.txt and install pip requirements
 RUN pip-compile requirements.in && \

README.md

@@ -2,7 +2,7 @@
 
 [![Deploy to Divio](https://docs.divio.com/deploy-to-divio.svg)](https://control.divio.com/app/new/?template_url=https://github.com/divio/getting-started-with-django/archive/refs/heads/main.zip)
 
-Welcome to our QuickStart template – your portal to swift application development and seamless local testing. Whether you're delving into Django for the first time or optimizing your workflow, our template, based on Djangos' [Getting started](https://docs.djangoproject.com/en/5.0/intro/) guide, has got you covered.
+Welcome to our QuickStart template – your portal to swift application development and seamless local testing. Whether you're delving into Django for the first time or optimizing your workflow, our template, based on Djangos' [Getting started](https://docs.djangoproject.com/en/stable/intro/) guide, has got you covered.
 
 ## Cloud Setup
 

mysite/settings.py

@@ -29,7 +29,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = os.environ.get('DEBUG', 'True') == 'True'
 
-ALLOWED_HOSTS = ["*"]
+ALLOWED_HOSTS = ['localhost', '127.0.0.1', '.aldryn.io']
 CSRF_TRUSTED_ORIGINS=["https://*.aldryn.io"]