Merge pull request #14 from AlexandraPoturaeva/docker

Docker

.dockerignore

@@ -0,0 +1,40 @@
+# Include any files or directories that you don't want to be copied to your
+# container here (e.g., local build artifacts, temporary files, etc.).
+#
+# For more help, visit the .dockerignore file reference guide at
+# https://docs.docker.com/engine/reference/builder/#dockerignore-file
+
+**/.DS_Store
+**/__pycache__
+**/.venv
+**/.classpath
+**/.dockerignore
+**/.env
+**/.env.*
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
+**/*.bat
+**/*.sample
+venv/
+.idea/
+.pytest_cache/

.github/workflows/deploy-image.yml

@@ -0,0 +1,48 @@
+#
+name: Create and publish a Docker image
+
+# Configures this workflow to run every time a change is pushed to the branch called `release`.
+on:
+  push:
+    branches: ['release']
+
+# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+    permissions:
+      contents: read
+      packages: write
+      #
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
+      # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
+      # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+      - name: Build and push Docker image
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -122,6 +122,7 @@ celerybeat.pid
 
 # Environments
 .env
+.env.*
 .venv
 env/
 venv/

Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.11-alpine
+
+EXPOSE 8000
+
+WORKDIR /app
+
+RUN python -m pip install --upgrade pip
+
+COPY requirements.txt /app
+
+RUN python -m pip install -r requirements.txt
+
+COPY . /app
+
+ENTRYPOINT ["python"]
+
+CMD ["manage.py", "runserver", "0.0.0.0:8000"]

events/migrations/0004_alter_application_options_alter_participant_options.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.6 on 2023-11-19 11:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0003_application_participant'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='application',
+            options={'get_latest_by': 'created_at', 'ordering': ['-created_at']},
+        ),
+        migrations.AlterModelOptions(
+            name='participant',
+            options={'get_latest_by': 'created_at', 'ordering': ['last_name']},
+        ),
+    ]

requirements.txt

@@ -1,9 +1,12 @@
 add-trailing-comma==3.1.0
+dj-database-url==2.1.0
 Django==4.2.6
 django-extensions==3.2.3
 flake8==6.1.0
+gunicorn==21.2.0
 Pillow==10.1.0
 pre-commit==3.5.0
+psycopg2-binary==2.9.9
 pytest-django==4.6.0
 python-dotenv==1.0.0
 social-auth-app-django==5.4.0

sports_events/settings.py

@@ -13,7 +13,13 @@
 import os
 from pathlib import Path
 from dotenv import load_dotenv
-load_dotenv()
+import dj_database_url
+
+ENVIRONMENT = os.getenv('ENV')
+if ENVIRONMENT == 'prod':
+    load_dotenv('.env.prod')
+else:
+    load_dotenv()
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -22,28 +28,28 @@
 # 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-0rqld6-pd0(50pe=tqw_b3fwd*2b4lv4s%ygz1@q=xvez#6#12'
+SECRET_KEY = os.getenv('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = os.getenv('DEBUG')
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS').split(' ')
 
 # Application definition
 
 INSTALLED_APPS = [
-    'users',
-    'core',
-    'events',
-
+    'django.contrib.sessions',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
-    'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'social_django',
     'django_extensions',
+
+    'core',
+    'users',
+    'events',
 ]
 
 MIDDLEWARE = [
@@ -87,10 +93,7 @@
 # https://docs.djangoproject.com/en/4.2/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    },
+    'default': dj_database_url.config(conn_max_age=600, conn_health_checks=True),
 }
 
 # Password validation