From d28b1424410d753a2c699a1ea53583a1d15dbdf5 Mon Sep 17 00:00:00 2001 From: dmysob Date: Wed, 27 May 2026 15:05:51 +0900 Subject: [PATCH] =?UTF-8?q?v0.3.22=20chore:=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20deploy=20job=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20Linux-=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BC=D0=BE=D1=81=D1=82=D0=B8,=20=D1=81=D0=B5=D0=BA=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D1=8B=20Gitea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy.yml | 11 ++++++++--- CHANGELOG.md | 3 +++ docker-compose.yml | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 9980ca5..926cde5 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -37,12 +37,17 @@ jobs: - name: Build Docker image run: docker build -t max-telegram-bridge-bot:latest . + - name: Create .env file from secrets + run: | + echo "TG_TOKEN=${{ secrets.TG_TOKEN }}" > .env + echo "MAX_TOKEN=${{ secrets.MAX_TOKEN }}" >> .env + echo "TG_API_URL=${{ secrets.TG_API_URL }}" >> .env + - name: Deploy with Docker Compose - working-directory: C:\docker\DockerCompose_directory\max-telegram-bridge-bot-0.3.2 - run: docker-compose up -d --build + run: docker-compose up -d - name: Health check run: | echo "Waiting for container to start..." - timeout /t 10 + sleep 10 docker ps --filter "name=bridge" --format "table {{.Names}}\t{{.Status}}\t{{.Image}}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 122f7f3..1cd882a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ --- +## [v0.3.22] — 2026-05-27 +- CI/CD: исправлен deploy job — универсальные Linux-команды, секреты Gitea + ## [v0.3.21] — 2026-05-27 - CI/CD: локальный Gitea + act_runner (git.d368.ru) diff --git a/docker-compose.yml b/docker-compose.yml index 1fdae44..61ed8cb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ services: bridge: build: . + image: max-telegram-bridge-bot:latest restart: unless-stopped env_file: .env environment: