diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 312e69f..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: 2 -updates: - - # Maintain dependencies for GitHub Actions - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - - # Maintain dependencies for docker - - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "daily" diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml deleted file mode 100644 index 1dec0f3..0000000 --- a/.github/workflows/auto-update.yml +++ /dev/null @@ -1,105 +0,0 @@ -name: update-bot - -on: - push: - branches: - - master - schedule: - - cron: '30 23 * * *' - -jobs: - check: - runs-on: ubuntu-latest - outputs: - img_ver: ${{ steps.check_ver.outputs.img_ver }} - qbt_ver: ${{ steps.check_ver.outputs.qbt_ver }} - lib_ver: ${{ steps.check_ver.outputs.lib_ver }} - is_new: ${{ steps.check_ver.outputs.is_new }} - latest: ${{ steps.check_ver.outputs.latest }} - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Check version - id: check_ver - run: | - OLD_VER=$(curl -s "${GHCR_URL}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)-r\d+" | head -1) - NEW_TAG=$(curl -s "${REPO_TAGS}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)\.zip" | head -1) - LIB_VER=$(jq -r '.libtorrent' ./latest.json) - QBT_VER=$(jq -r '.qbittorrent' ./latest.json) - PKG_REL=$(jq -r '.pkgrel' ./latest.json) - if echo "${NEW_TAG%.zip}" | grep -Pq "^(\d+\.){2}\d+$"; then - echo "::set-output name=latest::type=raw,latest" - elif [ ${{ github.event_name }} == 'push' ]; then - IMG_VER="${QBT_VER}-r${PKG_REL}" - else - QBT_VER="${NEW_TAG%.zip}" - IMG_VER="${QBT_VER}-r0" - fi - IS_NEW=$([[ "${IMG_VER}" != "${OLD_VER}" ]] && echo "yes" || echo "no") - echo "::set-output name=img_ver::${IMG_VER}" - echo "::set-output name=qbt_ver::${QBT_VER}" - echo "::set-output name=lib_ver::${LIB_VER}" - echo "::set-output name=is_new::${IS_NEW}" - env: - GHCR_URL: https://github.com/mogeko/docker-qbittorrent/pkgs/container/qbittorrent - REPO_TAGS: https://github.com/qbittorrent/qBittorrent/tags - - build: - runs-on: ubuntu-latest - needs: check - if: ${{ needs.check.outputs.is_new == 'yes' }} - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Log in to Docker Hub - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@e5622373a38e60fb6d795a4421e56882f2d7a681 - with: - images: | - ${{ github.repository_owner }}/qbittorrent - ghcr.io/${{ github.repository_owner }}/qbittorrent - tags: | - type=edge - type=schedule,pattern={{date 'YYYYMMDD'}} - type=raw,${{ needs.check.outputs.img_ver }} - ${{ needs.check.outputs.latest }} - - - name: Build and push Docker image - id: build - uses: docker/build-push-action@a66e35b9cbcf4ad0ea91ffcaf7bbad63ad9e0229 - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - QBITTORRENT_VERSION=${{ needs.check.outputs.qbt_ver }} - LIBTORRENT_VERSION=${{ needs.check.outputs.lib_ver }} - - - name: Save metadata - run: echo ${{ toJSON(steps.build.outputs.metadata) }} > ${{ github.workspace }}/meta.json - - - name: Update metadata - uses: actions/upload-artifact@v2 - with: - name: metadata - path: ${{ github.workspace }}/meta.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 8b96931..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: Build Container - -on: - push: - branches-ignore: - - master - pull_request: - branches: - - master - -jobs: - check: - runs-on: ubuntu-latest - outputs: - new_ver: ${{ steps.check_ver.outputs.new_ver }} - latest: ${{ steps.check_ver.outputs.latest }} - steps: - - name: Check version - id: check_ver - run: | - NEW_TAG=$(curl -s "${REPO_TAGS}" | grep -Po "(\d+\.)+\d+(|beta\d+|rc\d+)\.zip" | head -1) - if echo "${NEW_TAG%.zip}" | grep -Pq "^(\d+\.){2}\d+$"; then - echo "::set-output name=latest::type=raw,latest" - fi - echo "::set-output name=new_ver::${NEW_TAG%.zip}-r0" - env: - REPO_TAGS: https://github.com/qbittorrent/qBittorrent/tags - - meta: - runs-on: ubuntu-latest - needs: check - permissions: - packages: write - contents: read - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@e5622373a38e60fb6d795a4421e56882f2d7a681 - with: - images: | - ${{ github.repository_owner }}/qbittorrent - ghcr.io/${{ github.repository_owner }}/qbittorrent - tags: | - type=edge - type=schedule,pattern={{date 'YYYYMMDD'}} - type=raw,${{ needs.check.outputs.new_ver }} - ${{ needs.check.outputs.latest }} - - - name: Save status - run: echo ${{ toJSON(steps.meta.outputs.json) }} > ${{ github.workspace }}/status.json - - - name: Update status - uses: actions/upload-artifact@v2 - with: - name: status - path: ${{ github.workspace }}/status.json diff --git a/Dockerfile b/Dockerfile index ed93bcc..aa604c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 as base_clang +FROM alpine:latest as base_clang RUN apk add --no-cache boost-build boost-dev build-base clang-dev cmake ninja @@ -41,7 +41,7 @@ RUN cmake . -DCMAKE_BUILD_TYPE=Release \ && ninja -j$(nproc) \ && ninja install -FROM alpine:3.14 +FROM alpine:latest RUN apk add --no-cache busybox libgcc openssl qt5-qtbase zlib diff --git a/latest.json b/latest.json index 42011f3..063f6d1 100644 --- a/latest.json +++ b/latest.json @@ -1,5 +1,5 @@ { - "qbittorrent": "4.4.0rc1", - "libtorrent": "2.0.4", + "qbittorrent": "4.6.7", + "libtorrent": "2.0.10", "pkgrel": 0 }