diff --git a/.gitea/workflows/docker-publish.yaml b/.gitea/workflows/docker-publish.yaml new file mode 100644 index 0000000..9518736 --- /dev/null +++ b/.gitea/workflows/docker-publish.yaml @@ -0,0 +1,58 @@ +name: Build and Push PetClones-site + +on: + push: + # Запускать только при создании тега, начинающегося с 'v' (например, v1.0.0) + tags: + - 'v*' + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + # Генерируем метаданные (теги) для Docker + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + # Важно: используем gitea.repository + images: git.cube2.ru/${{ gitea.repository }} + tags: | + type=ref,event=tag + type=raw,value=latest,enable=${{ gitea.ref_type == 'tag' }} + + # Логин в реестр Gitea + - name: Login to Gitea Registry + uses: docker/login-action@v2 + with: + registry: git.cube2.ru + # Важно: используем gitea.actor + username: ${{ gitea.actor }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + # Сборка и отправка образа + - name: Build and push image PetClones-site + uses: docker/build-push-action@v4 + with: + context: . + file: Dockerfile + # platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 + push: true + # Используем теги, сгенерированные шагом meta (v0.1.0 и latest) + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + # Кэширование для ускорения повторных сборок + cache-from: type=gha + cache-to: type=gha,mode=max + # Увеличиваем тайм-аут на случай медленного интернета + timeout: 1800 # 30 минут diff --git a/.gitignore b/.gitignore index 476dafa..9c8831b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml +# IDE - GitHub Copilot state (local IDE state, not needed in repo) +.idea/copilotDiffState.xml + # Gradle .idea/**/gradle.xml .idea/**/libraries diff --git a/.idea/copilotDiffState.xml b/.idea/copilotDiffState.xml deleted file mode 100644 index 3747414..0000000 --- a/.idea/copilotDiffState.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/config/pets-clone--nginx.conf b/config/nginx/pet-clones--external-nginx.conf similarity index 100% rename from config/pets-clone--nginx.conf rename to config/nginx/pet-clones--external-nginx.conf