v0.7.8

.gitea/workflows/build.yml

@@ -26,17 +26,20 @@ jobs:
           username: ${{ gitea.repository_owner }}
           password: ${{ secrets.ACCESS_TOKEN }}
 
-      - name: Set repository name to lowercase
-        id: repo
+      # Преобразуем имена в нижний регистр и собираем метаданные
+      - name: Prepare metadata
+        id: meta
         run: |
           OWNER=$(echo "${{ gitea.repository_owner }}" | tr '[:upper:]' '[:lower:]')
           REPO=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')
+          
           echo "owner=$OWNER" >> $GITHUB_OUTPUT
           echo "repo=$REPO" >> $GITHUB_OUTPUT
-          echo "full_repo=$OWNER/$REPO" >> $GITHUB_OUTPUT
-          
-          # Также сохраняем полный путь к образу
           echo "image=git.uvpn.shop/$OWNER/$REPO" >> $GITHUB_OUTPUT
+          echo "source=https://git.uvpn.shop/${{ gitea.repository }}" >> $GITHUB_OUTPUT
+          
+          # Формируем дату
+          echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
@@ -44,14 +47,13 @@ jobs:
           context: .
           push: true
           tags: |
-            ${{ steps.repo.outputs.image }}:latest
-            ${{ steps.repo.outputs.image }}:${{ gitea.ref_name }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+            ${{ steps.meta.outputs.image }}:latest
+            ${{ steps.meta.outputs.image }}:${{ gitea.ref_name }}
           build-args: |
             BUILD_VERSION=${{ gitea.ref_name }}
-            BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+            BUILD_DATE=${{ steps.meta.outputs.build_date }}
             VCS_REF=${{ github.sha }}
+            GITEA_REPOSITORY=${{ steps.meta.outputs.source }}
 
       - name: Create Gitea Release via API
         run: |
@@ -62,7 +64,7 @@ jobs:
           {
             "tag_name": "${{ gitea.ref_name }}",
             "name": "Release ${{ gitea.ref_name }}",
-            "body": "## Релиз ${{ gitea.ref_name }}\n\n📝 ${TAG_MESSAGE_ESCAPED}\n\n---\n\n**🏷️ Тег:** \`${{ gitea.ref_name }}\`\n**👤 Автор:** @${{ gitea.actor }}\n**📦 Образ:** \`${{ steps.repo.outputs.image }}:${{ gitea.ref_name }}\`\n\n✅ Автоматически собрано и развёрнуто",
+            "body": "## Релиз ${{ gitea.ref_name }}\n\n📝 ${TAG_MESSAGE_ESCAPED}\n\n---\n\n**🏷️ Тег:** \`${{ gitea.ref_name }}\`\n**👤 Автор:** @${{ gitea.actor }}\n**📦 Образ:** \`${{ steps.meta.outputs.image }}:${{ gitea.ref_name }}\`\n\n✅ Автоматически собрано и развёрнуто",
             "draft": false,
             "prerelease": false
           }
@@ -103,7 +105,7 @@ jobs:
             echo "${{ secrets.ACCESS_TOKEN }}" | docker login git.uvpn.shop -u ${{ gitea.repository_owner }} --password-stdin
             
             # Используем образ с правильным именем в нижнем регистре
-            export IMAGE_NAME="git.uvpn.shop/uvpn/backend"
+            export IMAGE_NAME="${{ steps.meta.outputs.image }}"
             
             docker compose pull
             docker compose down || true

Dockerfile

@@ -6,6 +6,7 @@ WORKDIR /app
 ARG BUILD_VERSION=unknown
 ARG BUILD_DATE=unknown
 ARG VCS_REF=unknown
+ARG GITEA_REPOSITORY=unknown
 
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \
@@ -15,13 +16,19 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 FROM python:3.12-alpine
 WORKDIR /app
 
+# Аргументы должны быть объявлены в каждом этапе
+ARG BUILD_VERSION=unknown
+ARG BUILD_DATE=unknown
+ARG VCS_REF=unknown
+ARG GITEA_REPOSITORY=unknown
+
 # Метки для образа
-LABEL org.opencontainers.image.title="uVPN Backend"
-LABEL org.opencontainers.image.description="uVPN Shop Backend Service"
+LABEL org.opencontainers.image.title="UVPN Backend"
+LABEL org.opencontainers.image.description="UVPN Shop Backend Service"
 LABEL org.opencontainers.image.version="${BUILD_VERSION}"
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 LABEL org.opencontainers.image.revision="${VCS_REF}"
-LABEL org.opencontainers.image.source="https://git.uvpn.shop/${{ gitea.repository }}"
+LABEL org.opencontainers.image.source="${GITEA_REPOSITORY}"
 LABEL org.opencontainers.image.licenses="MIT"
 
 COPY --from=builder /app/.venv /app/.venv

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "uvpn-backend"
-version = "0.7.7"
+version = "0.7.8"
 description = "FastAPI backend with Docker for uvpn.shop"
 readme = "README.md"
 requires-python = ">=3.12"

routers/hosts.py

@@ -42,7 +42,7 @@ async def get_nodes():
             'name': clean_host_name(host.remark),
             'address': host.address,
             'port': host.port,
-            'country_code': (await remnawave.nodes.get_one_node(uuid=host.nodes[0])).country_code
+            'country_code': (await remnawave.nodes.get_one_node(uuid=host.nodes[0].hex)).country_code
         }
 
         for host in hosts.root if not host.is_disabled and not host.is_hidden