From 96c05ca7af8a186efa9ec81e1db349f270a08ec8 Mon Sep 17 00:00:00 2001 From: Dmitrii Prokudin Date: Wed, 25 Dec 2024 04:43:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TgBots/.dockerignore => .dockerignore | 0 .gitea/workflows/deploy.yml | 38 ++++++++++++++++++ TgBots/Dockerfile => Dockerfile | 0 TgBots/Program.cs => Program.cs | 0 TgBots/TgBots.sln => TgBots.sln | 0 TgBots/.idea/.idea.TgBots/.idea/.gitignore | 13 ------ TgBots/.idea/.idea.TgBots/.idea/encodings.xml | 4 -- .../.idea/.idea.TgBots/.idea/indexLayout.xml | 8 ---- ...TheDayBot.csproj => UserOfTheDayBot.csproj | 0 .../docker-compose.yml => docker-compose.yml | 0 ...CoreApp,Version=v8.0.AssemblyAttributes.cs | 0 .../net8.0/UserOfTheDayBot.AssemblyInfo.cs | 0 .../UserOfTheDayBot.AssemblyInfoInputs.cache | 0 ....GeneratedMSBuildEditorConfig.editorconfig | 0 .../net8.0/UserOfTheDayBot.GlobalUsings.g.cs | 0 .../Debug/net8.0/UserOfTheDayBot.assets.cache | Bin ...OfTheDayBot.csproj.AssemblyReference.cache | Bin .../UserOfTheDayBot.csproj.nuget.dgspec.json | 0 .../UserOfTheDayBot.csproj.nuget.g.props | 0 .../UserOfTheDayBot.csproj.nuget.g.targets | 0 {TgBots/obj => obj}/project.assets.json | 0 {TgBots/obj => obj}/project.nuget.cache | 0 {TgBots/obj => obj}/project.packagespec.json | 0 .../rider.project.model.nuget.info | 0 .../obj => obj}/rider.project.restore.info | 0 25 files changed, 38 insertions(+), 25 deletions(-) rename TgBots/.dockerignore => .dockerignore (100%) create mode 100644 .gitea/workflows/deploy.yml rename TgBots/Dockerfile => Dockerfile (100%) rename TgBots/Program.cs => Program.cs (100%) rename TgBots/TgBots.sln => TgBots.sln (100%) delete mode 100644 TgBots/.idea/.idea.TgBots/.idea/.gitignore delete mode 100644 TgBots/.idea/.idea.TgBots/.idea/encodings.xml delete mode 100644 TgBots/.idea/.idea.TgBots/.idea/indexLayout.xml rename TgBots/UserOfTheDayBot.csproj => UserOfTheDayBot.csproj (100%) rename TgBots/docker-compose.yml => docker-compose.yml (100%) rename {TgBots/obj => obj}/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.AssemblyInfo.cs (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.AssemblyInfoInputs.cache (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.GeneratedMSBuildEditorConfig.editorconfig (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.GlobalUsings.g.cs (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.assets.cache (100%) rename {TgBots/obj => obj}/Debug/net8.0/UserOfTheDayBot.csproj.AssemblyReference.cache (100%) rename {TgBots/obj => obj}/UserOfTheDayBot.csproj.nuget.dgspec.json (100%) rename {TgBots/obj => obj}/UserOfTheDayBot.csproj.nuget.g.props (100%) rename {TgBots/obj => obj}/UserOfTheDayBot.csproj.nuget.g.targets (100%) rename {TgBots/obj => obj}/project.assets.json (100%) rename {TgBots/obj => obj}/project.nuget.cache (100%) rename {TgBots/obj => obj}/project.packagespec.json (100%) rename {TgBots/obj => obj}/rider.project.model.nuget.info (100%) rename {TgBots/obj => obj}/rider.project.restore.info (100%) diff --git a/TgBots/.dockerignore b/.dockerignore similarity index 100% rename from TgBots/.dockerignore rename to .dockerignore diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..a6d1fa6 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,38 @@ +name: Local Deploy with Docker + +on: + push: + branches: + - main + +jobs: + build-and-deploy: + runs-on: self-hosted + + steps: + # 1. Checkout репозиторий + - name: Checkout Repository + uses: actions/checkout@v3 + + # 2. Сборка Docker-образа + - name: Build Docker Image + run: | + docker build -t telegram-bot:latest . + + # 3. Остановка и удаление старого контейнера (если существует) + - name: Stop and Remove Existing Container + run: | + docker stop telegram-bot || true + docker rm telegram-bot || true + + # 4. Запуск нового контейнера + - name: Run New Docker Container + run: | + docker run -d --name telegram-bot \ + --restart=always \ + -e DATABASE_HOST=localhost \ + -e DATABASE_NAME=telegram_bot \ + -e DATABASE_USER=postgres \ + -e DATABASE_PASSWORD=${{ secrets.DB_PASSWORD }} \ + -e BOT_TOKEN=${{ secrets.BOT_TOKEN }} \ + telegram-bot:latest diff --git a/TgBots/Dockerfile b/Dockerfile similarity index 100% rename from TgBots/Dockerfile rename to Dockerfile diff --git a/TgBots/Program.cs b/Program.cs similarity index 100% rename from TgBots/Program.cs rename to Program.cs diff --git a/TgBots/TgBots.sln b/TgBots.sln similarity index 100% rename from TgBots/TgBots.sln rename to TgBots.sln diff --git a/TgBots/.idea/.idea.TgBots/.idea/.gitignore b/TgBots/.idea/.idea.TgBots/.idea/.gitignore deleted file mode 100644 index b64b516..0000000 --- a/TgBots/.idea/.idea.TgBots/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/contentModel.xml -/projectSettingsUpdater.xml -/.idea.TgBots.iml -/modules.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/TgBots/.idea/.idea.TgBots/.idea/encodings.xml b/TgBots/.idea/.idea.TgBots/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/TgBots/.idea/.idea.TgBots/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TgBots/.idea/.idea.TgBots/.idea/indexLayout.xml b/TgBots/.idea/.idea.TgBots/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/TgBots/.idea/.idea.TgBots/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/TgBots/UserOfTheDayBot.csproj b/UserOfTheDayBot.csproj similarity index 100% rename from TgBots/UserOfTheDayBot.csproj rename to UserOfTheDayBot.csproj diff --git a/TgBots/docker-compose.yml b/docker-compose.yml similarity index 100% rename from TgBots/docker-compose.yml rename to docker-compose.yml diff --git a/TgBots/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs similarity index 100% rename from TgBots/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs rename to obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfo.cs b/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfo.cs similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfo.cs rename to obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfo.cs diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfoInputs.cache b/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfoInputs.cache similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfoInputs.cache rename to obj/Debug/net8.0/UserOfTheDayBot.AssemblyInfoInputs.cache diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net8.0/UserOfTheDayBot.GeneratedMSBuildEditorConfig.editorconfig similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.GeneratedMSBuildEditorConfig.editorconfig rename to obj/Debug/net8.0/UserOfTheDayBot.GeneratedMSBuildEditorConfig.editorconfig diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.GlobalUsings.g.cs b/obj/Debug/net8.0/UserOfTheDayBot.GlobalUsings.g.cs similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.GlobalUsings.g.cs rename to obj/Debug/net8.0/UserOfTheDayBot.GlobalUsings.g.cs diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.assets.cache b/obj/Debug/net8.0/UserOfTheDayBot.assets.cache similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.assets.cache rename to obj/Debug/net8.0/UserOfTheDayBot.assets.cache diff --git a/TgBots/obj/Debug/net8.0/UserOfTheDayBot.csproj.AssemblyReference.cache b/obj/Debug/net8.0/UserOfTheDayBot.csproj.AssemblyReference.cache similarity index 100% rename from TgBots/obj/Debug/net8.0/UserOfTheDayBot.csproj.AssemblyReference.cache rename to obj/Debug/net8.0/UserOfTheDayBot.csproj.AssemblyReference.cache diff --git a/TgBots/obj/UserOfTheDayBot.csproj.nuget.dgspec.json b/obj/UserOfTheDayBot.csproj.nuget.dgspec.json similarity index 100% rename from TgBots/obj/UserOfTheDayBot.csproj.nuget.dgspec.json rename to obj/UserOfTheDayBot.csproj.nuget.dgspec.json diff --git a/TgBots/obj/UserOfTheDayBot.csproj.nuget.g.props b/obj/UserOfTheDayBot.csproj.nuget.g.props similarity index 100% rename from TgBots/obj/UserOfTheDayBot.csproj.nuget.g.props rename to obj/UserOfTheDayBot.csproj.nuget.g.props diff --git a/TgBots/obj/UserOfTheDayBot.csproj.nuget.g.targets b/obj/UserOfTheDayBot.csproj.nuget.g.targets similarity index 100% rename from TgBots/obj/UserOfTheDayBot.csproj.nuget.g.targets rename to obj/UserOfTheDayBot.csproj.nuget.g.targets diff --git a/TgBots/obj/project.assets.json b/obj/project.assets.json similarity index 100% rename from TgBots/obj/project.assets.json rename to obj/project.assets.json diff --git a/TgBots/obj/project.nuget.cache b/obj/project.nuget.cache similarity index 100% rename from TgBots/obj/project.nuget.cache rename to obj/project.nuget.cache diff --git a/TgBots/obj/project.packagespec.json b/obj/project.packagespec.json similarity index 100% rename from TgBots/obj/project.packagespec.json rename to obj/project.packagespec.json diff --git a/TgBots/obj/rider.project.model.nuget.info b/obj/rider.project.model.nuget.info similarity index 100% rename from TgBots/obj/rider.project.model.nuget.info rename to obj/rider.project.model.nuget.info diff --git a/TgBots/obj/rider.project.restore.info b/obj/rider.project.restore.info similarity index 100% rename from TgBots/obj/rider.project.restore.info rename to obj/rider.project.restore.info