test

Reviewed-on: https://git.jbranan.com/jblu/phc/pulls/2

.drone.yml

@@ -5,19 +5,33 @@ steps:
 - name: docker
   image: plugins/docker
   settings:
-    registry: git.jbranan.com
+    registry: git.jonb.io
     dry_run: false
     username: jblu
     password: 
       from_secret: gittea_drone
-    repo: git.jbranan.com/jblu/phc
+    repo: git.jonb.io/jblu/phc
     tags:
     - latest
   when:
     branch:
       - main
-- name: test
-  image: git.jbranan.com/jblu/phc:latest
+- name: docker-dev
+  image: plugins/docker
+  settings:
+    registry: git.jonb.io
+    dry_run: false
+    username: jblu
+    password: 
+      from_secret: gittea_drone
+    repo: git.jonb.io/jblu/phc
+    tags:
+    - dev
+  when:
+    branch:
+      - dev*
+- name: test-main
+  image: git.jonb.io/jblu/phc:latest
   environment:
     PHC_PLEX_SECRET_TOKEN:
       from_secret: PHC_PLEX_SECRET_TOKEN
@@ -25,17 +39,40 @@ steps:
       from_secret: PHC_HEALTHCHECK_URL
     PHC_HEALTHCHECK_ID:
       from_secret: PHC_HEALTHCHECK_ID
-    PHC_PLEX_HOST:
-      from_secret: PHC_PLEX_HOST
-    PHC_PLEX_PROTOCOL:
-      from_secret: PHC_PLEX_PROTOCOL
-    PHC_PLEX_PORT:
-      from_secret: PHC_PLEX_PORT
+    PHC_PLEX_URL:
+      from_secret: PHC_PLEX_URL
+    CRON:
+      from_secret: CRON
   commands:
   - echo $PHC_PLEX_SECRET_TOKEN
   - echo $PHC_HEALTHCHECK_URL
   - echo $PHC_HEALTHCHECK_ID
-  - echo $PHC_PLEX_HOST
-  - echo $PHC_PLEX_PROTOCOL
-  - echo $PHC_PLEX_PORT
-  - /bin/sh /opt/phc.sh
+  - echo $PHC_PLEX_URL
+  - echo $CRON
+  - /bin/sh /opt/phc.sh
+  when:
+    branch:
+      - main
+- name: test-dev
+  image: git.jonb.io/jblu/phc:dev
+  environment:
+    PHC_PLEX_SECRET_TOKEN:
+      from_secret: PHC_PLEX_SECRET_TOKEN
+    PHC_HEALTHCHECK_URL:
+      from_secret: PHC_HEALTHCHECK_URL
+    PHC_HEALTHCHECK_ID:
+      from_secret: PHC_HEALTHCHECK_ID
+    PHC_PLEX_URL:
+      from_secret: PHC_PLEX_URL
+    CRON:
+      from_secret: CRON
+  commands:
+  - echo $PHC_PLEX_SECRET_TOKEN
+  - echo $PHC_HEALTHCHECK_URL
+  - echo $PHC_HEALTHCHECK_ID
+  - echo $PHC_PLEX_URL
+  - echo $CRON
+  - /bin/sh /opt/phc.sh
+  when:
+    branch:
+      - dev*

Dockerfile

@@ -1,9 +1,7 @@
-from alpine:latest
-RUN apk add --no-cache curl
-COPY crontab opt
+FROM alpine:latest
+RUN apk add --no-cache curl supercronic
 COPY entrypoint.sh opt
 COPY phc.sh opt
-RUN crontab /opt/crontab
 RUN chmod +x /opt/entrypoint.sh
 RUN chmod +x /opt/phc.sh
 CMD ["/opt/entrypoint.sh"]

README.md

@@ -1,2 +1,3 @@
 # phc
 
+test

crontab

@@ -1 +0,0 @@
-*/30 * * * * . /etc/environment; sh /opt/phc.sh >> /logfile

entrypoint.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
-printenv | grep -v "no_proxy" >> /etc/environment
+CRON_CONFIG_FILE="/opt/crontab"
 
-crond -f
+echo "${CRON} sh /opt/phc.sh" > $CRON_CONFIG_FILE
+
+exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE

phc.sh

@@ -1,11 +1,9 @@
 : "${PHC_PLEX_SECRET_TOKEN:?Must set PHC_SECRET_TOKEN env variable}"
 : "${PHC_HEALTHCHECK_URL:?Must set PHC_HEALTHCHECK_URL env variable}"
 : "${PHC_HEALTHCHECK_ID:?Must set PHC_HEALTHCHECK_ID env variable}"
-: "${PHC_PLEX_HOST:?Must set PHC_PLEX_HOST env variable}"
-: "${PHC_PLEX_PORT:-32400}"
-: "${PHC_PLEX_PROTOCOL:-"http"}"
+: "${PHC_PLEX_URL:?Must set PHC_PLEX_URL env variable}"
 
-URL="${PHC_PLEX_PROTOCOL}://${PHC_PLEX_HOST}:${PHC_PLEX_PORT}/connections?X-Plex-Token=${PHC_PLEX_SECRET_TOKEN}"
+URL="${PHC_PLEX_URL}/connections?X-Plex-Token=${PHC_PLEX_SECRET_TOKEN}"
 
 ping_hc() {
   curl -fsS -m 10 --retry 5 -o /dev/null --data-raw "$2" "${PHC_HEALTHCHECK_URL}/ping/${PHC_HEALTHCHECK_ID}/$1"