From d009410c3f85d85022d5bf2684822693fd0aec6e Mon Sep 17 00:00:00 2001 From: austnv Date: Sun, 21 Jun 2026 15:11:39 +0300 Subject: [PATCH] v0.5.0 --- .dockerignore | 3 ++- .gitea/workflows/build.yml | 35 +++++++++++++++++++++++++++++++++++ docker-compose.yml | 3 +-- pyproject.toml | 2 +- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 .gitea/workflows/build.yml diff --git a/.dockerignore b/.dockerignore index a894811..2971796 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,4 +2,5 @@ __pycache__ *.pyc .git -.env \ No newline at end of file +.env +.gitea \ No newline at end of file diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml new file mode 100644 index 0000000..4f96ab6 --- /dev/null +++ b/.gitea/workflows/build.yml @@ -0,0 +1,35 @@ +name: Build and Push Docker Image + +on: + push: + branches: [ "master" ] # Запускать при пуше в эти ветки + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + # 1. Клонируем ваш репозиторий + - name: Checkout code + uses: actions/checkout@v4 + + # 2. Настраиваем Docker Buildx для сборки + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + # 3. Логинимся в Container Registry Gitea + - name: Login to Gitea Container Registry + uses: docker/login-action@v3 + with: + registry: git.uvpn.shop + username: ${{ gitea.repository_owner }} + password: ${{ secrets.ACCESS_TOKEN }} # Используем ваш секрет + + # 4. Собираем и пушим образ + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: | + git.uvpn.shop/uvpn/backend:latest + git.uvpn.shop/uvpn/backend:${{ gitea.sha }} # Полезно для версионирования \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 045ddda..f6c966f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,6 @@ services: backend: - build: . - image: uvpn-backend:latest + image: git.uvpn.shop/uvpn/backend:latest container_name: uvpn-backend volumes: - /opt/remnawave-minishop/data/tariffs.json:/app/data/tariffs.json diff --git a/pyproject.toml b/pyproject.toml index 39007dc..5596240 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "uvpn-backend" -version = "0.4.0" +version = "0.5.0" description = "FastAPI backend with Docker for uvpn.shop" readme = "README.md" requires-python = ">=3.12"