From 90087cb1bfebef60cb9218e5e222481bcf423083 Mon Sep 17 00:00:00 2001 From: sstent Date: Fri, 21 Nov 2025 17:12:55 -0800 Subject: [PATCH] sync --- .github/workflows/container-build.yml | 36 +++++++++++---------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/.github/workflows/container-build.yml b/.github/workflows/container-build.yml index c3b719d..2e08725 100644 --- a/.github/workflows/container-build.yml +++ b/.github/workflows/container-build.yml @@ -1,19 +1,10 @@ -name: Build and Push Qbitcheck Docker Image +name: Build and Push Docker Image on: workflow_dispatch: push: branches: - main - paths: - - 'Dockerfile' - - 'requirements.txt' - - 'main.py' - - 'api/**' - - 'config/**' - - 'monitoring/**' - - 'persistence/**' - - 'utils/**' jobs: build-and-push: @@ -26,15 +17,24 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Set registry URL + id: registry + run: | + if [ "${{ github.server_url }}" = "https://github.com" ]; then + echo "url=ghcr.io" >> $GITHUB_OUTPUT + else + echo "url=${{ github.server_url }}" | sed 's|https://||' >> $GITHUB_OUTPUT + fi + - name: Set up QEMU uses: docker/setup-qemu-action@v3 - - name: Log in to Gitea Container Registry + - name: Log in to Container Registry uses: docker/login-action@v3 with: - registry: gitea.service.dc1.fbleagh.duckdns.org + registry: ${{ steps.registry.outputs.url }} username: ${{ github.actor }} - password: ${{ secrets.GITEA_TOKEN || secrets.PACKAGE_TOKEN || secrets.GITHUB_TOKEN }} + password: ${{ secrets.PACKAGE_TOKEN || secrets.GITHUB_TOKEN }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -46,13 +46,7 @@ jobs: push: true platforms: linux/amd64,linux/arm64 tags: | - gitea.service.dc1.fbleagh.duckdns.org/sstent/qbitcheck:latest - gitea.service.dc1.fbleagh.duckdns.org/sstent/qbitcheck:${{ github.sha }} + ${{ steps.registry.outputs.url }}/${{ github.repository }}:latest + ${{ steps.registry.outputs.url }}/${{ github.repository }}:${{ github.sha }} cache-from: type=gha cache-to: type=gha,mode=max - - # OCI annotations for repository linking - labels: | - org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }} - org.opencontainers.image.title=Qbitcheck Connection Monitor - org.opencontainers.image.description=Python application for monitoring qBittorrent connections and managing remediation