Merge pull request 'migrated to supercronic' (#53) from dev-migrate-supercronic into main

Reviewed-on: https://git.jbranan.com/jblu/qbit-maid/pulls/53
2023-06-23 04:05:51 -05:00 · 2023-06-23 04:05:51 -05:00 · 167575fe5d
commit 167575fe5d
parent 660a18a70f ca1430b302
4 changed files with 21 additions and 5 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -15,4 +15,19 @@ steps:
    - latest
  when:
    branch:
-      - main
+      - main
+steps:
+- name: docker-test
+  image: plugins/docker
+  settings:
+    registry: git.jbranan.com
+    dry_run: false
+    username: jblu
+    password: 
+      from_secret: gittea_drone
+    repo: git.jbranan.com/jblu/qbit-maid
+    tags:
+    - dev
+  when:
+    branch:
+      - dev*
--- a/2
+++ b/2
@ -1,8 +1,8 @@
 FROM python:alpine3.18
 WORKDIR /
 COPY . opt
+RUN apk add --no-cache supercronic
 RUN pip install requests
 RUN pip install qbittorrent-api
-RUN crontab /opt/crontab
 RUN chmod +x /opt/entrypoint.sh
 CMD ["/opt/entrypoint.sh"]
--- a/1
+++ b/1
@ -1 +0,0 @@
-0 1 * * * . /etc/environment; python /opt/qbit-maid.py >> /logfile
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -1,5 +1,7 @@
 #!/bin/sh

-printenv | grep -v "no_proxy" >> /etc/environment
+CRON_CONFIG_FILE="/opt/crontab"

-crond -f
+echo "${CRON} python /opt/qbit-maid.py" > $CRON_CONFIG_FILE
+
+exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE
				`@ -1 +0,0 @@`
				`0 1 * * * . /etc/environment; python /opt/qbit-maid.py >> /logfile`