From 33c9433afd9a4f3f3a43bf663b660c0b334cd6b5 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Mon, 8 Jan 2024 16:36:28 +0300 Subject: [PATCH 1/9] Configure and setup docker --- .gitignore | 3 ++- Dockerfile | 29 +++++++++++++++++++++++++++++ docker-compose.dev.yml | 22 ++++++++++++++++++++++ post_it_backend/settings.py | 1 - 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.dev.yml diff --git a/.gitignore b/.gitignore index 293a1a2..58f79a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ __pycache__/ .env -env/ \ No newline at end of file +env/ +docker-compose.yaml \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8a7883d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +FROM python:3.7 + +#declare envs +ARG SECRET_KEY +ARG DB_NAME +ARG DB_USER +ARG DB_PASSWORD +ARG DB_HOST +ARG DB_PORT + +#load envs +ENV SECRET_KEY=${SECRET_KEY} \ + DB_NAME=${DB_NAME} \ + DB_USER=${DB_USER} \ + DB_PASSWORD=${DB_PASSWORD} \ + DB_HOST=${DB_HOST} \ + DB_PORT=${DB_PORT} + +RUN mkdir /postit + +WORKDIR /postit + +COPY requirements.txt . + +RUN pip install -r requirements.txt + +EXPOSE 8000 + +CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"] diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 0000000..ee4ded1 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,22 @@ +services: + db: + image: postgres + environment: + - POSTGRES_PASSWORD=admin + web: + build: . + command: python manage.py runserver 0.0.0.0:8000 + volumes: + - .:/postit + ports: + - "8000:8000" + depends_on: + - db + environment: + - SECRET_KEY= + - DB_NAME= + - DB_USER= + - DB_PASSWORD= + - DB_HOST= + - DB_PORT= + tty: true diff --git a/post_it_backend/settings.py b/post_it_backend/settings.py index 4d681ee..ce985c9 100644 --- a/post_it_backend/settings.py +++ b/post_it_backend/settings.py @@ -17,7 +17,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) env = environ.Env() -environ.Env.read_env(env_file=str(BASE_DIR) + '/.env') # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ From 58f228e036cf91809799373ec15a599020bdc351 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Wed, 17 Jan 2024 22:57:51 +0300 Subject: [PATCH 2/9] Remove mkdir command --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a7883d..5d9333c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,6 @@ ENV SECRET_KEY=${SECRET_KEY} \ DB_HOST=${DB_HOST} \ DB_PORT=${DB_PORT} -RUN mkdir /postit - WORKDIR /postit COPY requirements.txt . From 82e1261d89289bd9582ca2dea417664d07d1125f Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Wed, 17 Jan 2024 22:58:42 +0300 Subject: [PATCH 3/9] Remove compose file from gitignore, add env_file --- .gitignore | 3 +-- docker-compose.yml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index 58f79a0..293a1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ __pycache__/ .env -env/ -docker-compose.yaml \ No newline at end of file +env/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..00af9de --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,24 @@ +services: + db: + image: postgres + environment: + - POSTGRES_PASSWORD=admin + web: + build: . + command: python manage.py runserver 0.0.0.0:8000 + volumes: + - .:/postit + ports: + - "8000:8000" + depends_on: + - db + environment: + - SECRET_KEY=${SECRET_KEY} + - DB_NAME=${DB_NAME} + - DB_USER=${DB_USER} + - DB_PASSWORD=${DB_PASSWORD} + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + env_file: + - .env + tty: true From 6df7df6d47e05529cd714cdcec3f6d946f2faceb Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Thu, 18 Jan 2024 12:51:32 +0300 Subject: [PATCH 4/9] Remove variables from Dockerfile --- Dockerfile | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d9333c..3b39b52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,5 @@ FROM python:3.7 -#declare envs -ARG SECRET_KEY -ARG DB_NAME -ARG DB_USER -ARG DB_PASSWORD -ARG DB_HOST -ARG DB_PORT - -#load envs -ENV SECRET_KEY=${SECRET_KEY} \ - DB_NAME=${DB_NAME} \ - DB_USER=${DB_USER} \ - DB_PASSWORD=${DB_PASSWORD} \ - DB_HOST=${DB_HOST} \ - DB_PORT=${DB_PORT} - WORKDIR /postit COPY requirements.txt . From ecc3e72dbf7b4526cc0ce5cdb925c3226a4c3f64 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Thu, 18 Jan 2024 13:12:48 +0300 Subject: [PATCH 5/9] Move postgres password to env file --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 00af9de..b3535b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,9 @@ services: db: image: postgres environment: - - POSTGRES_PASSWORD=admin + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + env_file: + - .env web: build: . command: python manage.py runserver 0.0.0.0:8000 From f63d100d478feb85c1d8c00d11710d5b9dd4c702 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Thu, 18 Jan 2024 13:14:03 +0300 Subject: [PATCH 6/9] Update docker-compose.dev file --- docker-compose.dev.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ee4ded1..b3535b7 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,7 +2,9 @@ services: db: image: postgres environment: - - POSTGRES_PASSWORD=admin + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + env_file: + - .env web: build: . command: python manage.py runserver 0.0.0.0:8000 @@ -13,10 +15,12 @@ services: depends_on: - db environment: - - SECRET_KEY= - - DB_NAME= - - DB_USER= - - DB_PASSWORD= - - DB_HOST= - - DB_PORT= + - SECRET_KEY=${SECRET_KEY} + - DB_NAME=${DB_NAME} + - DB_USER=${DB_USER} + - DB_PASSWORD=${DB_PASSWORD} + - DB_HOST=${DB_HOST} + - DB_PORT=${DB_PORT} + env_file: + - .env tty: true From e3129aacd0fa9c7343fea8adfcde505593ffca90 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Mon, 22 Jan 2024 17:19:05 +0300 Subject: [PATCH 7/9] Remove env_file --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b3535b7..0276063 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,6 @@ services: image: postgres environment: - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - env_file: - - .env web: build: . command: python manage.py runserver 0.0.0.0:8000 @@ -21,6 +19,4 @@ services: - DB_PASSWORD=${DB_PASSWORD} - DB_HOST=${DB_HOST} - DB_PORT=${DB_PORT} - env_file: - - .env tty: true From 696b43c8c91fd94ec15e826b6d18d0420e254593 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Thu, 22 Feb 2024 11:08:36 +0300 Subject: [PATCH 8/9] Update to python 3.9 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b39b52..6ab5314 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7 +FROM python:3.9 WORKDIR /postit From 1bdcf807879eadff6002cd9c58e717f2c5241b77 Mon Sep 17 00:00:00 2001 From: APIYOJENNIFER Date: Thu, 22 Feb 2024 11:36:03 +0300 Subject: [PATCH 9/9] Add explicit versions for requirements --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 99b9950..d34b032 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ -django -djangorestframework -psycopg2 -django-environ -pylint -flake8 -pylint-django \ No newline at end of file +Django==4.2.6 +django-environ==0.11.2 +djangorestframework==3.14.0 +flake8==6.1.0 +psycopg2==2.9.9 +pylint==3.0.2 +pylint-django==2.5.5 \ No newline at end of file