diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index b6529da..0000000 --- a/.drone.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/.gitea/workflows/docker-dev.yml b/.gitea/workflows/docker-dev.yml new file mode 100644 index 0000000..c0242c7 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml new file mode 100644 index 0000000..bb14729 --- /dev/null +++ b/.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 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 7998c21..eb9add2 100755 --- a/Dockerfile +++ b/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"] \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh index e776646..cc63b7d 100755 --- a/entrypoint.sh +++ b/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 +echo "${CRON} python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE +echo "@reboot python /opt/qbit-maid.py" >> $CRON_CONFIG_FILE -exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE \ No newline at end of file +exec crond -f \ No newline at end of file