Datanar 2.0.0 - Docker edition

.dockerignore

@@ -0,0 +1,4 @@
+**/*.sqlite3
+**/*.mo
+**/static
+**/media

.env.example

@@ -1,17 +1,31 @@
-DJANGO_DEBUG=False
-DJANGO_SECRET_KEY=this_is_test_key_-_some_very_dummy_secret_key
-DJANGO_ALLOWED_HOSTS=*
+COMPOSE_PROFILES=dev
 
-DJANGO_MAIL_HOST=smtp.mail.ru
-DJANGO_MAIL_PORT=2525
-DJANGO_MAIL_USER=webmaster@localhost
-DJANGO_MAIL_PASSWORD=this_very_secret_password_for_smtp_mail
+DATANAR_DJANGO_DEBUG=False
+DATANAR_SECRET_KEY=this_is_test_key_-_some_very_dummy_secret_key
+DJANGO_LOG_FILE_PATH=./logs/django.log
+DATANAR_ALLOWED_HOSTS=*
 
-DJANGO_DEFAULT_USER_IS_ACTIVE=True
+DATANAR_MAIL_HOST=smtp.mail.ru
+DATANAR_MAIL_PORT=2525
+DATANAR_MAIL_USER=webmaster@localhost
+DATANAR_MAIL_PASSWORD=this_very_secret_password_for_smtp_mail
 
-DJANGO_USE_SIMPLE_DATABASE=True
-DJANGO_DATABASE_NAME=database
-DJANGO_DATABASE_USER=webmaster
-DJANGO_DATABASE_PASSWORD=this_very_secret_password_for_database
+DATANAR_DEFAULT_USER_IS_ACTIVE=False
+DATANAR_SUPERUSER_NAME=admin
+DATANAR_SUPERUSER_EMAIL=webmaster@localhost
+DATANAR_SUPERUSER_PASSWORD=this_very_secret_password_for_superuser
 
-DJANGO_LOG_FILE_PATH=/path/to/log/file
+DATANAR_USE_FILE_DATABASE=False
+DATANAR_DATABASE_NAME=database
+DATANAR_DATABASE_USER=webmaster
+DATANAR_DATABASE_PASSWORD=this_very_secret_password_for_database
+DATANAR_DATABASE_HOST=postgres
+DATANAR_DATABASE_PORT=5432
+
+DATANAR_REDIS_HOST=redis
+DATANAR_REDIS_PORT=6379
+DATANAR_REDIS_DB=0
+
+DATANAR_CERTBOT_DEBUG=1
+DATANAR_CERTBOT_STAGING=1
+DATANAR_CERTBOT_EMAIL=webmaster@localhost

.github/workflows/python-app.yml

@@ -1,4 +1,4 @@
-name: Python application
+name: Datanar
 
 on:
   push:
@@ -42,35 +42,6 @@ jobs:
           cd ./datanar
           python manage.py test
 
-  test-deploy:
-    if: github.ref == 'refs/heads/dev'
-    needs: [black-test, flake8-test, django-test]
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v3
-
-    - name: Deploy to server
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.SERVER_HOST }}
-        username: ${{ secrets.SERVER_USERNAME }}
-        key: ${{ secrets.SERVER_SSH_KEY }}
-        script: |
-          sudo supervisorctl stop test_gunicorn test_celery
-          cd ~/test_datanar
-          git reset --hard origin/dev
-          git pull origin dev
-          source venv/bin/activate
-          pip install -r requirements/dev.txt
-          cd ~/test_datanar/datanar
-          python manage.py migrate
-          python manage.py compilemessages
-          python manage.py collectstatic --no-input
-          deactivate
-          cd ~
-          sudo supervisorctl start test_gunicorn test_celery
-
   prod-deploy:
     if: github.ref == 'refs/heads/main'
     needs: [black-test, flake8-test, django-test]
@@ -86,16 +57,8 @@ jobs:
         username: ${{ secrets.SERVER_USERNAME }}
         key: ${{ secrets.SERVER_SSH_KEY }}
         script: |
-          sudo supervisorctl stop gunicorn celery
           cd ~/datanar
-          git reset --hard origin/main
+          git reset --hard origin/main  
           git pull origin main
-          source venv/bin/activate
-          pip install -r requirements/dev.txt
-          cd ~/datanar/datanar
-          python manage.py migrate
-          python manage.py compilemessages
-          python manage.py collectstatic --no-input
-          deactivate
-          cd ~
-          sudo supervisorctl start gunicorn celery
+          docker compose down -v
+          docker compose up --build -d

.gitignore

@@ -3,8 +3,15 @@ __pycache__/
 *.pyc
 *$py.class
 
+for_docker/nginx_certificates
+for_docker/postgres_data
+for_docker/logs
+static/
+media/
+logs/
+
 *.so
-db.sqlite3
+*.sqlite3
 .Python
 build/
 develop-eggs/
@@ -13,7 +20,6 @@ eggs/
 .eggs/
 lib/
 lib64/
-media/
 parts/
 sdist/
 var/

Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3.12.4-slim
+
+RUN apt update
+RUN apt install gettext -y
+
+COPY ./requirements /requirements
+RUN pip install -r requirements/dev.txt
+RUN rm -rf requirements
+
+COPY ./datanar /datanar/
+WORKDIR /datanar
+
+CMD python manage.py migrate \
+ && python manage.py init_superuser \
+ && python manage.py compilemessages \
+ && python manage.py collectstatic --no-input \
+ && gunicorn datanar.wsgi:application \
+    --workers $(nproc) \
+    --bind 0.0.0.0:8000 \
+    --access-logfile /datanar/logs/gunicorn_access.log \
+    --error-logfile /datanar/logs/gunicorn_error.log