From 1ff450c37eadda20a7a7127b4333c7580a1b2ee7 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:30:41 +0300 Subject: [PATCH 01/11] fix naming --- compose.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/compose.yaml b/compose.yaml index c6e96c4..fabc53e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,7 @@ services: - app: - container_name: wtukatyr/django-example-app:latest + django-app: + image: wtukatyr/django-example-app:latest + container_name: django-app ports: - "8989:8000" depends_on: From ac5abef53fc6ce0791b2dd14e1a8fa02145bb6f3 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:32:21 +0300 Subject: [PATCH 02/11] dont run pipeline on push --- .github/workflows/ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 35d641e..2f1390c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,13 +1,11 @@ name: CI-pipeline on: workflow_dispatch: - push: - branches: - - dev - pull_request: branches: - main + types: + - opened jobs: linters: From ed96af5c4f91d1a9506550e1d7c857220662f820 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:35:14 +0300 Subject: [PATCH 03/11] fix network name --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index fabc53e..bf2f264 100644 --- a/compose.yaml +++ b/compose.yaml @@ -15,7 +15,7 @@ services: env_file: - .env networks: - - proxy-common + - proxy_common db: image: postgres:14 restart: always From d9ca6a3887e9c2efda265dd471e145cb6f6b52b7 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:55:13 +0300 Subject: [PATCH 04/11] todo --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index bf2f264..820f09d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -31,6 +31,7 @@ services: volumes: - pg-data:/var/lib/postgresql/data environment: + # TODO: fix env POSTGRES_USER: sa POSTGRES_PASSWORD: example POSTGRES_PORT: 5432 From 487f714d6b803562ae2b65ab7341db26ec67d116 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 11:02:25 +0300 Subject: [PATCH 05/11] add local network --- compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/compose.yaml b/compose.yaml index 820f09d..91098b4 100644 --- a/compose.yaml +++ b/compose.yaml @@ -15,7 +15,9 @@ services: env_file: - .env networks: + - django_app_network - proxy_common + db: image: postgres:14 restart: always @@ -35,10 +37,15 @@ services: POSTGRES_USER: sa POSTGRES_PASSWORD: example POSTGRES_PORT: 5432 + networks: + - django_app_network + - proxy_common volumes: pg-data: networks: + django_app_network: + name: django_app_network proxy_common: external: true From 7942dc76617163e4cd9ae17f9afc662652fb7448 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 11:03:37 +0300 Subject: [PATCH 06/11] fix env --- compose.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/compose.yaml b/compose.yaml index 91098b4..3183381 100644 --- a/compose.yaml +++ b/compose.yaml @@ -33,10 +33,11 @@ services: volumes: - pg-data:/var/lib/postgresql/data environment: - # TODO: fix env - POSTGRES_USER: sa - POSTGRES_PASSWORD: example - POSTGRES_PORT: 5432 + POSTGRES_USER: ${DATABASE_USERNAME} + POSTGRES_PASSWORD: ${DATABASE_PASSWORD} + POSTGRES_PORT: ${DATABASE_PORT} + env_file: + - .env networks: - django_app_network - proxy_common From e5e2c104f7697987212a7700e678c66c749e766a Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 11:17:08 +0300 Subject: [PATCH 07/11] remove fake job --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f1390c..87e903a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,9 +55,6 @@ jobs: Repository: ${{ github.repository }} See changes: https://github.com/${{ github.repository }}/commit/${{github.sha}} - - name: Check fail - run: echo "Unreachable" - - name: Notify in telegram about success uses: appleboy/telegram-action@master with: From 9d33e8ccbc8c95192c864c853ff93f9ff3cf871e Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 12:01:12 +0300 Subject: [PATCH 08/11] add saccada host --- mysite/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysite/settings.py b/mysite/settings.py index 0a5c1ea..24de387 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -26,7 +26,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ["localhost"] +ALLOWED_HOSTS = ["localhost", "app.saccada.xyz"] # Application definition From 52012032a32734f7e07c8e4e26fba96b1487bf11 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 12:02:08 +0300 Subject: [PATCH 09/11] add db name to postgres --- compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose.yaml b/compose.yaml index 3183381..5cdfada 100644 --- a/compose.yaml +++ b/compose.yaml @@ -33,6 +33,7 @@ services: volumes: - pg-data:/var/lib/postgresql/data environment: + POSTGRES_DB: ${DATABASE_NAME} POSTGRES_USER: ${DATABASE_USERNAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} POSTGRES_PORT: ${DATABASE_PORT} From 9ada62f718f83ab6a248b2f626c5eb558bad17bb Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 13:29:40 +0300 Subject: [PATCH 10/11] mount instead copy --- Dockerfile | 2 -- compose.yaml | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8a6e1cf..cf734c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ WORKDIR /app COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt -COPY ./mysite ./mysite -COPY ./polls ./polls COPY ./manage.py . RUN ./manage.py makemigrations diff --git a/compose.yaml b/compose.yaml index 5cdfada..16a506e 100644 --- a/compose.yaml +++ b/compose.yaml @@ -6,6 +6,9 @@ services: - "8989:8000" depends_on: - db + volumes: + ./mysite:/app/mysite + ./polls:/app/polls environment: DATABASE_NAME: ${DATABASE_NAME} DATABASE_USERNAME: ${DATABASE_USERNAME} From 0a8bd3e4efb1679b3f671bc22a37665674381139 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 13:31:29 +0300 Subject: [PATCH 11/11] don't need a rebuild docker if files not touched --- .github/workflows/docker-build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index fb33147..420f996 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -6,6 +6,10 @@ on: - main types: - closed + paths: + - Dockerfile + - requirements.txt + - manage.py jobs: build-and-push: