Merge branch 'main' of https://git.myterior.kz/murod_bts/django_magazine
commit
cd7854dd2e
|
@ -0,0 +1,7 @@
|
||||||
|
__pycache__
|
||||||
|
*.pyc
|
||||||
|
*.pyo
|
||||||
|
*.pyd
|
||||||
|
.Python
|
||||||
|
env
|
||||||
|
*.sqlite3
|
|
@ -0,0 +1,30 @@
|
||||||
|
# Use an official Python runtime as a parent image
|
||||||
|
FROM python:3.10
|
||||||
|
|
||||||
|
# Set environment variables
|
||||||
|
ENV PYTHONDONTWRITEBYTECODE 1
|
||||||
|
ENV PYTHONUNBUFFERED 1
|
||||||
|
|
||||||
|
# Set the working directory in the container
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Copy the current directory contents into the container at /app
|
||||||
|
COPY . /app
|
||||||
|
|
||||||
|
# Install any needed packages specified in requirements.txt
|
||||||
|
RUN pip install --upgrade pip
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
RUN python manage.py collectstatic --noinput
|
||||||
|
|
||||||
|
# Copy the startup script
|
||||||
|
COPY start.sh /app/
|
||||||
|
RUN chmod +x /app/start.sh
|
||||||
|
|
||||||
|
# Make port 8000 available to the world outside this container
|
||||||
|
EXPOSE 8000
|
||||||
|
|
||||||
|
# Define environment variable
|
||||||
|
ENV NAME World
|
||||||
|
|
||||||
|
# Run manage.py when the container launches
|
||||||
|
CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
|
|
@ -8,7 +8,7 @@ SECRET_KEY = 'django-insecure-&!4%-vjbqun^7idhr9ov$3*!233xczz4zt4i1bj_x&ur14makw
|
||||||
|
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
|
|
||||||
ALLOWED_HOSTS = ['127.0.0.1', 'localhost']
|
ALLOWED_HOSTS = ['*']
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
|
@ -130,7 +130,7 @@ STATIC_URL = '/static/'
|
||||||
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
|
||||||
|
|
||||||
#python -Xutf8 manage.py dumpdata -o db.json
|
#python -Xutf8 manage.py dumpdata -o db.json
|
||||||
#python manage.py loaddata db.json
|
|
||||||
|
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
STATIC_ROOT = BASE_DIR / 'static'
|
STATIC_ROOT = BASE_DIR / 'static'
|
||||||
|
@ -167,6 +167,3 @@ PASSWORD_RESET_TIMEOUT_DAYS = 1
|
||||||
# AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
|
# AWS_SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY')
|
||||||
|
|
||||||
# AWS_STORAGE_BUCKET_NAME = 'e--shop-bucket'
|
# AWS_STORAGE_BUCKET_NAME = 'e--shop-bucket'
|
||||||
|
|
||||||
if os.getcwd() == '/app' :
|
|
||||||
DEBUG = False
|
|
|
@ -14,3 +14,7 @@ urlpatterns = [
|
||||||
|
|
||||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||||
|
|
||||||
|
if settings.DEBUG:
|
||||||
|
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||||
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
|
@ -0,0 +1,16 @@
|
||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
web:
|
||||||
|
build: .
|
||||||
|
command: sh -c "/app/start.sh"
|
||||||
|
volumes:
|
||||||
|
- .:/app
|
||||||
|
- ./media:/app/media
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
- DEBUG=1
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
media:
|
|
@ -57,7 +57,7 @@ class Product(models.Model):
|
||||||
count = int(reviews['count'])
|
count = int(reviews['count'])
|
||||||
return count
|
return count
|
||||||
|
|
||||||
def get_prodcut_details_url(self):
|
def get_product_details_url(self):
|
||||||
return reverse('shop:product_details', args=[self.category.slug, self.slug])
|
return reverse('shop:product_details', args=[self.category.slug, self.slug])
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Apply database migrations
|
||||||
|
echo "Applying database migrations..."
|
||||||
|
python manage.py migrate
|
||||||
|
|
||||||
|
# Load data from db.json
|
||||||
|
echo "Loading data from db.json..."
|
||||||
|
python manage.py loaddata db.json
|
||||||
|
|
||||||
|
# Start the Django development server
|
||||||
|
echo "Starting Django server..."
|
||||||
|
python manage.py runserver 0.0.0.0:8000 --insecure
|
Loading…
Reference in New Issue