Merge pull request #15 from Studio-Yandex-Practicum/docker/docker_com…

…pose

Docker/docker compose

.gitignore

@@ -155,4 +155,6 @@ cython_debug/
 # PyCharm
 .idea/
 
+# Static
 static/
+

Dockerfile

@@ -10,7 +10,10 @@ RUN python -m pip install --no-cache-dir poetry==1.6.1 \
 
 FROM python:3.11-slim-bullseye
 
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
 COPY --from=builder /app /app
 COPY adaptive_hockey_federation/ ./
+ENTRYPOINT ["/entrypoint.sh"]
 
 CMD ["/app/.venv/bin/gunicorn", "adaptive_hockey_federation.wsgi:application", "--bind", "0:8000" ]

README.md

@@ -36,3 +36,11 @@ docker run --name adaptive-hockey-federation -it -p 8000:8000 adaptive-hockey-fe
 cd adaptive_hockey_federation
 python manage.py runserver
 ```
+
+## Собрать приложения в контейнеры при помощи Docker-compose:
+
+```shell
+docker-compose up -d --build
+```
+
+Django-проект и Nginx запустятся в контейнерах, при помощи инструкций в entrypoint.sh через 10 секунд добавится статика

adaptive_hockey_federation/adaptive_hockey_federation/settings.py

@@ -1,35 +1,14 @@
-"""
-Django settings for adaptive_hockey_federation project.
-
-Generated by 'django-admin startproject' using Django 4.2.6.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/4.2/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/4.2/ref/settings/
-"""
 import os
-
 from pathlib import Path
 
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
 
+BASE_DIR = Path(__file__).resolve().parent.parent
 
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'django-insecure-))v)^p&_y!_-dsc7p)v%b@yi+#)k^34mp^ai8jc^9v)jpu2xn1'
-
-# SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS: list = []
-
+ALLOWED_HOSTS: list = ['*']
 
-# Application definition
 
 INSTALLED_APPS = [
     'django.contrib.admin',
@@ -73,21 +52,13 @@
 
 WSGI_APPLICATION = 'adaptive_hockey_federation.wsgi.application'
 
-
-# Database
-# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': BASE_DIR / 'db.sqlite3',
     }
 }
 
-
-# Password validation
-# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
-
 AUTH_PASSWORD_VALIDATORS = [
     {
         'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
@@ -103,10 +74,6 @@
     },
 ]
 
-
-# Internationalization
-# https://docs.djangoproject.com/en/4.2/topics/i18n/
-
 LANGUAGE_CODE = 'ru'
 
 TIME_ZONE = 'UTC'
@@ -115,15 +82,11 @@
 
 USE_TZ = True
 
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/4.2/howto/static-files/
-
 STATIC_URL = '/static/'
-
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATICFILES_DIRS = (os.path.join(BASE_DIR, 'static'),)
 
-# Default primary key field type
-# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

docker-compose.yaml

@@ -0,0 +1,26 @@
+version: '3.8'
+
+services:
+  site:
+    build: .
+    restart: always
+    volumes:
+      - static_value:/app/static/
+      - media_value:/app/media/
+    env_file:
+      - ./.env
+
+  nginx:
+    image: nginx:1.21.3-alpine
+    ports:
+      - "80:80"
+    volumes:
+      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+      - static_value:/var/html/static/
+      - media_value:/var/html/media/
+    depends_on:
+      - site
+
+volumes:
+  static_value:
+  media_value:

entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+sleep 10
+app/.venv/bin/python manage.py collectstatic  --noinput
+mv /static/* /app/static/
+
+exec "$@"

nginx/default.conf

@@ -0,0 +1,17 @@
+server {
+    listen 80;
+
+    server_name 127.0.0.1;
+
+    location /static/ {
+        root /var/html/;
+    }
+
+    location /media/ {
+        root /var/html/;
+    }
+
+    location / {
+        proxy_pass http://site:8000;
+    }
+} 

setup.cfg

@@ -10,3 +10,4 @@ exclude =
 per-file-ignores =
     */settings.py:E501
 max-complexity = 10 
+