Merge pull request 'fixed crontab writing jobs multiple times' (#61) from dev-update-crontab into main

Reviewed-on: #61

.drone.yml

@@ -1,55 +0,0 @@
-kind: pipeline
-name: default
-steps:
-- name: docker
-  image: plugins/docker
-  settings:
-    registry: git.jonb.io
-    dry_run: false
-    username: jblu
-    password: 
-      from_secret: gittea_drone
-    repo: git.jonb.io/jblu/qbit-maid
-    tags:
-    - latest
-  when:
-    branch:
-      - main
-    event:
-      - push
-- name: docker-test
-  image: plugins/docker
-  settings:
-    registry: git.jonb.io
-    dry_run: false
-    username: jblu
-    password: 
-      from_secret: gittea_drone
-    repo: git.jonb.io/jblu/qbit-maid
-    tags:
-    - dev
-  when:
-    branch:
-      - dev*
-    event:
-      - push
-- name: test-main
-  image: git.jonb.io/jblu/qbit-maid:latest
-  commands:
-  - python test_qbitmaid.py
-  - python test_write_csv.py
-  when:
-    branch:
-      - main
-    event:
-      - push
-- name: test-dev
-  image: git.jonb.io/jblu/qbit-maid:dev
-  commands:
-  - python test_qbitmaid.py
-  - python test_write_csv.py
-  when:
-    branch:
-      - dev*
-    event:
-      - push

.gitea/workflows/docker-dev.yml

@@ -0,0 +1,30 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - dev*
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v4
+        with:
+          registry: git.jonb.io
+          username: '${{ gitea.actor }}'
+          password: '${{ secrets.JONBIO_CI }}'
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      -
+        name: Build and push
+        uses: docker/build-push-action@v7
+        with:
+          push: true
+          tags: git.jonb.io/jblu/qbit-maid:dev

.gitea/workflows/docker.yml

@@ -0,0 +1,30 @@
+name: ci
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Login to Docker Hub
+        uses: docker/login-action@v4
+        with:
+          registry: git.jonb.io
+          username: '${{ gitea.actor }}'
+          password: '${{ secrets.JONBIO_CI }}'
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+      -
+        name: Build and push
+        uses: docker/build-push-action@v7
+        with:
+          push: true
+          tags: git.jonb.io/jblu/qbit-maid:latest

Dockerfile

@@ -1,8 +1,6 @@
-FROM python:alpine3.18
+FROM python:alpine3.23
 WORKDIR /
-COPY . opt
-RUN apk add --no-cache supercronic
-RUN pip install requests
-RUN pip install qbittorrent-api
+COPY *.py entrypoint.sh /opt/
+RUN pip install requests qbittorrent-api
 RUN chmod +x /opt/entrypoint.sh
 CMD ["/opt/entrypoint.sh"]

README.md

@@ -1,8 +1,7 @@
-
 # qbit-maid
 > Warning: This application removes torrents that are over the minimum age and that are not part of the ignored categories, domains or tags. Please use the delete_torrents feature set to false when first testing its functionality.
 
-[![Build Status](https://drone.jonb.io/api/badges/jblu/qbit-maid/status.svg?ref=refs/heads/main)](https://drone.jonb.io/jblu/qbit-maid)
+![Build Status](https://git.jonb.io/jblu/qbit-maid/actions/workflows/docker.yml/badge.svg)
 
 The objective is to remove torrents based on the following criteria:
 - tracker domain name

entrypoint.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 
-CRON_CONFIG_FILE="/opt/crontab"
+CRON_CONFIG_FILE="/etc/crontabs/root"
 
-echo "${CRON} python /opt/qbit-maid.py" > $CRON_CONFIG_FILE
+grep -qF 'python /opt/qbit-maid.py' $CRON_CONFIG_FILE || echo "${CRON} python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE
+grep -qF '@reboot' $CRON_CONFIG_FILE || echo "@reboot python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE
 
-exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE
+exec crond -f