From 3fbace542ed50896e214e427195c80b7e4d3238d Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 00:14:55 +0300 Subject: [PATCH 1/8] testing docker work flow --- .github/workflows/docker-image.yml | 2 +- .gitignore | 4 +- .vscode/settings.json | 8 +- devops/Dockerfile | 25 ++++++ devops/db.sqlite3 | 0 devops/devops/__init__.py | 0 devops/devops/asgi.py | 16 ++++ devops/devops/settings.py | 123 ++++++++++++++++++++++++++++ devops/devops/urls.py | 22 +++++ devops/devops/wsgi.py | 16 ++++ devops/manage.py | 22 +++++ devops/requirements.txt | 26 ++++++ Dockerfile => pipmanager/Dockerfile | 0 13 files changed, 259 insertions(+), 5 deletions(-) create mode 100644 devops/Dockerfile create mode 100644 devops/db.sqlite3 create mode 100644 devops/devops/__init__.py create mode 100644 devops/devops/asgi.py create mode 100644 devops/devops/settings.py create mode 100644 devops/devops/urls.py create mode 100644 devops/devops/wsgi.py create mode 100755 devops/manage.py create mode 100644 devops/requirements.txt rename Dockerfile => pipmanager/Dockerfile (100%) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 947db7f..61a9d0f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -23,7 +23,7 @@ jobs: - name: Build the Docker image run: | docker build . \ - --file Dockerfile \ + --file devops/Dockerfile \ --tag ${{ secrets.DOCKER_USERNAME }}/my-image-name:latest - name: Push Docker image to Docker Hub diff --git a/.gitignore b/.gitignore index be5115f..c28b504 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,5 @@ venv .venv .env -.vscode .pytest_cache -__pycache__ -.vscode/*.json \ No newline at end of file +__pycache__ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 1889430..31c04d5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,15 +1,21 @@ { "cSpell.words": [ + "collectstatic", "devopslab", + "gunicorn", "Hamad", "levelname", + "libsqlite", + "makemigrations", + "njmuh", "numpy", "pipmanager", "pycache", "pylint", "pytest", "PYTHONUNBUFFERED", - "venv" + "venv", + "wsgi" ], "DockerRun.DisableDockerrc": true } \ No newline at end of file diff --git a/devops/Dockerfile b/devops/Dockerfile new file mode 100644 index 0000000..453c80d --- /dev/null +++ b/devops/Dockerfile @@ -0,0 +1,25 @@ +FROM python:3.9-slim + +WORKDIR /app + +RUN apt-get update && apt-get install -y \ + build-essential \ + libsqlite3-dev \ + curl \ + git \ + ca-certificates \ + gnupg \ + lsb-release \ + && rm -rf /var/lib/apt/lists/* + +COPY requirements.txt . +RUN pip install --no-cache-dir -r requirements.txt + +COPY . . + +EXPOSE 8000 + +ENV DJANGO_SETTINGS_MODULE=devops.settings +ENV PYTHONUNBUFFERED=1 + +CMD ["gunicorn", "--bind", "0.0.0.0:8000", "devops.wsgi:application"] diff --git a/devops/db.sqlite3 b/devops/db.sqlite3 new file mode 100644 index 0000000..e69de29 diff --git a/devops/devops/__init__.py b/devops/devops/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/devops/devops/asgi.py b/devops/devops/asgi.py new file mode 100644 index 0000000..c945ae2 --- /dev/null +++ b/devops/devops/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for devops project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'devops.settings') + +application = get_asgi_application() diff --git a/devops/devops/settings.py b/devops/devops/settings.py new file mode 100644 index 0000000..e36e95d --- /dev/null +++ b/devops/devops/settings.py @@ -0,0 +1,123 @@ +""" +Django settings for devops project. + +Generated by 'django-admin startproject' using Django 4.2.16. + +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/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +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-$hb2njmuh+*929@061h^#!i&*9v9%yf4o!if2si7+0l64ja_@y' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = ['*'] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'devops.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'devops.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', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/4.2/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.2/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/devops/devops/urls.py b/devops/devops/urls.py new file mode 100644 index 0000000..e88902c --- /dev/null +++ b/devops/devops/urls.py @@ -0,0 +1,22 @@ +""" +URL configuration for devops project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/devops/devops/wsgi.py b/devops/devops/wsgi.py new file mode 100644 index 0000000..706ff44 --- /dev/null +++ b/devops/devops/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for devops project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'devops.settings') + +application = get_wsgi_application() diff --git a/devops/manage.py b/devops/manage.py new file mode 100755 index 0000000..4f17c5d --- /dev/null +++ b/devops/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'devops.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/devops/requirements.txt b/devops/requirements.txt new file mode 100644 index 0000000..0842c49 --- /dev/null +++ b/devops/requirements.txt @@ -0,0 +1,26 @@ +asgiref==3.8.1 +astroid==3.2.4 +backports.zoneinfo==0.2.1 +build==1.2.2.post1 +click==8.1.7 +dill==0.3.9 +Django==4.2.16 +exceptiongroup==1.2.2 +gunicorn==23.0.0 +importlib-metadata==8.5.0 +iniconfig==2.0.0 +isort==5.13.2 +mccabe==0.7.0 +packaging==24.2 +-e git+https://github.com/HamadMulti/devops-lab.git@a61fad4e7cc99012e4e1e3f5d6e1e50b5ad8fa07#egg=pipmanager&subdirectory=pipmanager +platformdirs==4.3.6 +pluggy==1.5.0 +pylint==3.2.7 +pyproject-hooks==1.2.0 +pytest==8.3.3 +pytest-mock==3.14.0 +sqlparse==0.5.2 +tomli==2.1.0 +tomlkit==0.13.2 +typing-extensions==4.12.2 +zipp==3.20.2 diff --git a/Dockerfile b/pipmanager/Dockerfile similarity index 100% rename from Dockerfile rename to pipmanager/Dockerfile From c09708a6e550930a6567a10fa32f7f902eaead00 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 00:23:19 +0300 Subject: [PATCH 2/8] adjustment to meet requirements --- devops/Dockerfile => Dockerfile | 3 +++ devops/db.sqlite3 => db.sqlite3 | 0 devops/{devops => }/__init__.py | 0 devops/{devops => }/asgi.py | 0 devops/{devops => }/settings.py | 0 devops/{devops => }/urls.py | 0 devops/{devops => }/wsgi.py | 0 devops/manage.py => manage.py | 0 devops/requirements.txt => requirements.txt | 0 9 files changed, 3 insertions(+) rename devops/Dockerfile => Dockerfile (87%) rename devops/db.sqlite3 => db.sqlite3 (100%) rename devops/{devops => }/__init__.py (100%) rename devops/{devops => }/asgi.py (100%) rename devops/{devops => }/settings.py (100%) rename devops/{devops => }/urls.py (100%) rename devops/{devops => }/wsgi.py (100%) rename devops/manage.py => manage.py (100%) rename devops/requirements.txt => requirements.txt (100%) diff --git a/devops/Dockerfile b/Dockerfile similarity index 87% rename from devops/Dockerfile rename to Dockerfile index 453c80d..3642d14 100644 --- a/devops/Dockerfile +++ b/Dockerfile @@ -17,6 +17,9 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . +RUN python manage.py makemigrations +RUN python manage.py migrate + EXPOSE 8000 ENV DJANGO_SETTINGS_MODULE=devops.settings diff --git a/devops/db.sqlite3 b/db.sqlite3 similarity index 100% rename from devops/db.sqlite3 rename to db.sqlite3 diff --git a/devops/devops/__init__.py b/devops/__init__.py similarity index 100% rename from devops/devops/__init__.py rename to devops/__init__.py diff --git a/devops/devops/asgi.py b/devops/asgi.py similarity index 100% rename from devops/devops/asgi.py rename to devops/asgi.py diff --git a/devops/devops/settings.py b/devops/settings.py similarity index 100% rename from devops/devops/settings.py rename to devops/settings.py diff --git a/devops/devops/urls.py b/devops/urls.py similarity index 100% rename from devops/devops/urls.py rename to devops/urls.py diff --git a/devops/devops/wsgi.py b/devops/wsgi.py similarity index 100% rename from devops/devops/wsgi.py rename to devops/wsgi.py diff --git a/devops/manage.py b/manage.py similarity index 100% rename from devops/manage.py rename to manage.py diff --git a/devops/requirements.txt b/requirements.txt similarity index 100% rename from devops/requirements.txt rename to requirements.txt From 526b6818c6d9a734d4eb61214d6306ceab0a9817 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 00:24:22 +0300 Subject: [PATCH 3/8] yml fix --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 61a9d0f..947db7f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -23,7 +23,7 @@ jobs: - name: Build the Docker image run: | docker build . \ - --file devops/Dockerfile \ + --file Dockerfile \ --tag ${{ secrets.DOCKER_USERNAME }}/my-image-name:latest - name: Push Docker image to Docker Hub From 45666ef21856a8e9d9227ff1d2f45d343b66fbd4 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 00:29:13 +0300 Subject: [PATCH 4/8] adjusting workflow --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 947db7f..0ef07de 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -24,8 +24,8 @@ jobs: run: | docker build . \ --file Dockerfile \ - --tag ${{ secrets.DOCKER_USERNAME }}/my-image-name:latest + --tag ${{ secrets.DOCKER_USERNAME }}/devops-django:latest - name: Push Docker image to Docker Hub run: | - docker push ${{ secrets.DOCKER_USERNAME }}/my-image-name:latest + docker push ${{ secrets.DOCKER_USERNAME }}/devops-django:latest From 80b5204051e43ba27c98129688a518ca4e1527c4 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 00:52:57 +0300 Subject: [PATCH 5/8] adding aws to repo --- .github/workflows/docker-image.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 0ef07de..f50997c 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,3 +29,12 @@ jobs: - name: Push Docker image to Docker Hub run: | docker push ${{ secrets.DOCKER_USERNAME }}/devops-django:latest + + - name: Log in to Amazon ECR + uses: aws-actions/amazon-ecr-login@v1 + with: + region: us-east-1 + + - name: Push Docker image to Amazon ECR + run: | + docker push ${{ secrets.AWS_URL }}:latest From b6cf47a33dd395214f4f8ac74cc34ed4d60541df Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 01:31:14 +0300 Subject: [PATCH 6/8] hotfix --- .github/workflows/docker-image.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f50997c..0ef07de 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -29,12 +29,3 @@ jobs: - name: Push Docker image to Docker Hub run: | docker push ${{ secrets.DOCKER_USERNAME }}/devops-django:latest - - - name: Log in to Amazon ECR - uses: aws-actions/amazon-ecr-login@v1 - with: - region: us-east-1 - - - name: Push Docker image to Amazon ECR - run: | - docker push ${{ secrets.AWS_URL }}:latest From be64bb5e9aefb12220b506bb6877f9678b778f60 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 01:43:03 +0300 Subject: [PATCH 7/8] removing backports --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0842c49..5663f4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ asgiref==3.8.1 astroid==3.2.4 -backports.zoneinfo==0.2.1 +# backports.zoneinfo==0.2.1 build==1.2.2.post1 click==8.1.7 dill==0.3.9 From e1ea189793cb60f32790134aaab3846c7ba0b137 Mon Sep 17 00:00:00 2001 From: HamadMulti Date: Sun, 24 Nov 2024 01:43:33 +0300 Subject: [PATCH 8/8] removing pipmanager --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5663f4b..de0c2d4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,8 +11,8 @@ importlib-metadata==8.5.0 iniconfig==2.0.0 isort==5.13.2 mccabe==0.7.0 -packaging==24.2 --e git+https://github.com/HamadMulti/devops-lab.git@a61fad4e7cc99012e4e1e3f5d6e1e50b5ad8fa07#egg=pipmanager&subdirectory=pipmanager +# packaging==24.2 +# -e git+https://github.com/HamadMulti/devops-lab.git@a61fad4e7cc99012e4e1e3f5d6e1e50b5ad8fa07#egg=pipmanager&subdirectory=pipmanager platformdirs==4.3.6 pluggy==1.5.0 pylint==3.2.7