From 4e32228fd723a216ff94ff423d7eb1813f0f1142 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:09:31 +0300 Subject: [PATCH 1/5] add proxy common network --- compose.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose.yaml b/compose.yaml index 021cdfa..9e876b0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -14,6 +14,8 @@ services: DATABASE_PORT: ${DATABASE_PORT} env_file: - .env + networks: + - proxy-common db: image: postgres:14 restart: always @@ -35,3 +37,7 @@ services: volumes: pg-data: + +networks: + proxy-common: + external: true From 1985b9cc127f57aa539d7d11542fdb9aa26bd6cf Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:18:31 +0300 Subject: [PATCH 2/5] new port --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index 9e876b0..958b200 100644 --- a/compose.yaml +++ b/compose.yaml @@ -3,7 +3,7 @@ services: build: . container_name: django-app ports: - - "80:8000" + - "8989:8000" depends_on: - db environment: From 452c2cc5c7549a1496c54c872f78521f2115dda5 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:27:25 +0300 Subject: [PATCH 3/5] fix network and container name --- compose.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/compose.yaml b/compose.yaml index 958b200..c6e96c4 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,7 +1,6 @@ services: app: - build: . - container_name: django-app + container_name: wtukatyr/django-example-app:latest ports: - "8989:8000" depends_on: @@ -39,5 +38,5 @@ volumes: pg-data: networks: - proxy-common: + proxy_common: external: true From 1ff450c37eadda20a7a7127b4333c7580a1b2ee7 Mon Sep 17 00:00:00 2001 From: Basyrov Rustam Date: Fri, 6 Jun 2025 00:30:41 +0300 Subject: [PATCH 4/5] 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 5/5] 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: