From 7e24a7444e37887b3e26a510b5b378249b8df7b7 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Wed, 16 Jul 2025 22:46:00 +0300 Subject: [PATCH 01/14] feat: added deploy script --- .gitea/deploy-dev.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitea/deploy-dev.yml diff --git a/.gitea/deploy-dev.yml b/.gitea/deploy-dev.yml new file mode 100644 index 0000000..fdfeba3 --- /dev/null +++ b/.gitea/deploy-dev.yml @@ -0,0 +1,16 @@ +name: Publish JOBot on dev +on: [push] +branch: dev + +jobs: + build and deploy: + runs-on: ubuntu-latest + name: Build and deploy + steps: + - name: Update repo + run: | + cd /home/dockeruser/jobot-stack/JOBot.Backend + git checkout dev + git pull + dotnet ef database update + sudo docker compose up --build -d \ No newline at end of file From 6d5c327747d7419c153762d6b7174edf6e636975 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Wed, 16 Jul 2025 22:47:01 +0300 Subject: [PATCH 02/14] fix: fixed workflow --- .gitea/{ => workflows}/deploy-dev.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitea/{ => workflows}/deploy-dev.yml (100%) diff --git a/.gitea/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml similarity index 100% rename from .gitea/deploy-dev.yml rename to .gitea/workflows/deploy-dev.yml From d041fd870bb6fb3aec5fc023b37742531fd8416b Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Wed, 16 Jul 2025 22:57:32 +0300 Subject: [PATCH 03/14] fix: fix conf --- .gitea/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index fdfeba3..da17896 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Update repo run: | - cd /home/dockeruser/jobot-stack/JOBot.Backend + cd ./JOBot.Backend git checkout dev git pull dotnet ef database update From 4b223ecf985eb8adc6262f81175700d7acef1da6 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Wed, 16 Jul 2025 22:57:50 +0300 Subject: [PATCH 04/14] chore: debug pipeline --- .gitea/workflows/deploy-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index da17896..6f190fe 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -9,6 +9,7 @@ jobs: steps: - name: Update repo run: | + pwd cd ./JOBot.Backend git checkout dev git pull From 86cad2beec46f9967693d8f1b891ac2ab2c95e8f Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Wed, 16 Jul 2025 23:07:47 +0300 Subject: [PATCH 05/14] fix: fix pipeline --- .gitea/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 6f190fe..1772b8c 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -10,7 +10,7 @@ jobs: - name: Update repo run: | pwd - cd ./JOBot.Backend + cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull dotnet ef database update From 3b8278ba661aee54d38fcf6c2294de944378c5ac Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 15:51:16 +0300 Subject: [PATCH 06/14] chore: test deploy --- .gitea/workflows/deploy-dev.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 1772b8c..40652e2 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -4,8 +4,10 @@ branch: dev jobs: build and deploy: - runs-on: ubuntu-latest + runs-on: host name: Build and deploy + volumes: + steps: - name: Update repo run: | @@ -14,4 +16,4 @@ jobs: git checkout dev git pull dotnet ef database update - sudo docker compose up --build -d \ No newline at end of file + sudo docker compose up --build -dz \ No newline at end of file From 10d0a83e15ed6d905baf5a7ba7a24c7f89fd5f52 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 15:55:30 +0300 Subject: [PATCH 07/14] test: test pipeline --- .gitea/workflows/deploy-dev.yml | 4 ++-- JOBot.Backend/appsettings.Staging.json | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 JOBot.Backend/appsettings.Staging.json diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 40652e2..28ef4ee 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -15,5 +15,5 @@ jobs: cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull - dotnet ef database update - sudo docker compose up --build -dz \ No newline at end of file + dotnet ef database update --environment Development + sudo docker compose up --build -d \ No newline at end of file diff --git a/JOBot.Backend/appsettings.Staging.json b/JOBot.Backend/appsettings.Staging.json deleted file mode 100644 index f8b140b..0000000 --- a/JOBot.Backend/appsettings.Staging.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*", - "ConnectionStrings": { - "PostgreSQL": "Host=postgres;Port=5432;Database=jobot_test;Username=postgres;Password=LocalDbPass" - } -} \ No newline at end of file From 18e6fcc883071751f8195b6a32a603a8f7df0997 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 15:58:11 +0300 Subject: [PATCH 08/14] chore: update pipeline --- .gitea/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 28ef4ee..6879612 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -15,5 +15,5 @@ jobs: cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull - dotnet ef database update --environment Development + dotnet ef database update -- --environment Development sudo docker compose up --build -d \ No newline at end of file From 1f0bc01dc60c3ef2fa96bad56a39843f596804a0 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 15:59:40 +0300 Subject: [PATCH 09/14] chore: update pipeline --- .gitea/workflows/deploy-dev.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 6879612..565f156 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -15,5 +15,6 @@ jobs: cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull + docker compose up -d postgres dotnet ef database update -- --environment Development sudo docker compose up --build -d \ No newline at end of file From f6500670c025072d8a4793c56b73243dc1cd546f Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 16:01:37 +0300 Subject: [PATCH 10/14] chore: update pipeline --- .gitea/workflows/deploy-dev.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index 565f156..ab8af52 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -15,6 +15,7 @@ jobs: cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull - docker compose up -d postgres + docker compose up -d postgres -f compose.dev.yml dotnet ef database update -- --environment Development - sudo docker compose up --build -d \ No newline at end of file + sudo docker compose up --build -d + \ No newline at end of file From cf463a5d94a893853459dc1dce3337028dbc9bdd Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 16:02:20 +0300 Subject: [PATCH 11/14] chore: update pipeline --- .gitea/workflows/deploy-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index ab8af52..bfe19e0 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -15,7 +15,7 @@ jobs: cd /home/dockeruser/jobot-stack/JOBot.Backend git checkout dev git pull - docker compose up -d postgres -f compose.dev.yml + docker compose -f compose.dev.yml up -d postgres dotnet ef database update -- --environment Development sudo docker compose up --build -d \ No newline at end of file From 2f79bd336a18b5c62653c0b92b5436a66e171276 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 16:07:29 +0300 Subject: [PATCH 12/14] chore: update pipeline --- .gitea/workflows/deploy-dev.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml index bfe19e0..167ce64 100644 --- a/.gitea/workflows/deploy-dev.yml +++ b/.gitea/workflows/deploy-dev.yml @@ -12,10 +12,12 @@ jobs: - name: Update repo run: | pwd - cd /home/dockeruser/jobot-stack/JOBot.Backend + cd /home/dockeruser/jobot-stack git checkout dev git pull docker compose -f compose.dev.yml up -d postgres + + cd /home/dockeruser/jobot-stack/JOBot.Backend dotnet ef database update -- --environment Development - sudo docker compose up --build -d + docker compose up --build -d \ No newline at end of file From 445a1f7fa44bd3b8f9df9aec85077551afa4e476 Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 16:23:23 +0300 Subject: [PATCH 13/14] fix: fix of docker compose file --- compose.dev.yml | 11 +++++++++-- compose.yml | 14 +++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/compose.dev.yml b/compose.dev.yml index 7770047..23cc888 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -9,7 +9,7 @@ services: ports: - "5432:5432" volumes: - - ./.docker/postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql/data networks: - jobot @@ -35,4 +35,11 @@ services: - jobot networks: - jobot: \ No newline at end of file + jobot: + +volumes: + postgres_data: + driver: local + driver_opts: + type: none + device: ./.docker/postgres_data \ No newline at end of file diff --git a/compose.yml b/compose.yml index 5c87703..82dd186 100644 --- a/compose.yml +++ b/compose.yml @@ -5,9 +5,9 @@ services: image: postgres:15 environment: POSTGRES_PASSWORD: LocalDbPass - POSTGRES_DB: jobot + POSTGRES_DB: jobot volumes: - - ./.docker/postgres_data:/var/lib/postgresql/data + - postgres_data:/var/lib/postgresql/data networks: - jobot @@ -32,4 +32,12 @@ services: - jobot networks: - jobot: \ No newline at end of file + jobot: + + +volumes: + postgres_data: + driver: local + driver_opts: + type: none + device: ./.docker/postgres_data \ No newline at end of file From 81bf05e3fc89be95e2850979a3f6389bdd3975ee Mon Sep 17 00:00:00 2001 From: Lisoveliy Date: Fri, 18 Jul 2025 16:28:10 +0300 Subject: [PATCH 14/14] fix: fix of compose files --- compose.dev.yml | 6 +----- compose.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/compose.dev.yml b/compose.dev.yml index 23cc888..ea8011c 100644 --- a/compose.dev.yml +++ b/compose.dev.yml @@ -38,8 +38,4 @@ networks: jobot: volumes: - postgres_data: - driver: local - driver_opts: - type: none - device: ./.docker/postgres_data \ No newline at end of file + postgres_data: \ No newline at end of file diff --git a/compose.yml b/compose.yml index 82dd186..6ebc653 100644 --- a/compose.yml +++ b/compose.yml @@ -36,8 +36,4 @@ networks: volumes: - postgres_data: - driver: local - driver_opts: - type: none - device: ./.docker/postgres_data \ No newline at end of file + postgres_data: \ No newline at end of file