Merge pull request 'dev-fix-crontab-functionality' (#2) from dev-fix-crontab-functionality into main

Reviewed-on: #2

.dockerignore

@@ -1,5 +1,4 @@
 .gitignore
 LICENSE
 README.md
-.drone.yml
 Dockerfile

.gitea/workflows/docker-dev.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy docker container
+name: ci
 
 on:
   push:
@@ -6,22 +6,25 @@ on:
       - dev*
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout main
+      -
-        uses: actions/checkout@v4
+        name: Login to Docker Hub
-      - name: Set up Docker Buildx
+        uses: docker/login-action@v4
-        uses: docker/setup-buildx-action@v4
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
         with:
           registry: git.jonb.io
           username: '${{ gitea.actor }}'
           password: '${{ secrets.JONBIO_CI }}'
-      - name: Build and push
+      -
-        uses: docker/build-push-action@v6
+        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:
-          context: .
           push: true
-          tags: 'git.jonb.io/jblu/hottub:dev'
+          tags: git.jonb.io/jblu/hottub:dev

.gitea/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy docker container
+name: ci
 
 on:
   push:
@@ -6,22 +6,25 @@ on:
       - main
 
 jobs:
-  build:
+  docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout main
+      -
-        uses: actions/checkout@v4
+        name: Login to Docker Hub
-      - name: Set up Docker Buildx
+        uses: docker/login-action@v4
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
         with:
           registry: git.jonb.io
           username: '${{ gitea.actor }}'
           password: '${{ secrets.JONBIO_CI }}'
-      - name: Build and push
+      -
-        uses: docker/build-push-action@v6
+        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:
-          context: .
           push: true
-          tags: 'git.jonb.io/jblu/hottub:latest'
+          tags: git.jonb.io/jblu/hottub:latest

Dockerfile

@@ -1,5 +1,4 @@
 FROM alpine:latest
-COPY . opt
+COPY entrypoint.sh /opt
-RUN apk add --no-cache cronie
 RUN chmod +x /opt/entrypoint.sh
 CMD ["/opt/entrypoint.sh"]

entrypoint.sh

@@ -2,4 +2,8 @@
 
 CRON_CONFIG_FILE="/etc/crontabs/root"
 
-echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE
+grep -qF 'echo Come in the water is fine!' $CRON_CONFIG_FILE || echo "${CRON} echo Come in the water is fine!" >> $CRON_CONFIG_FILE
+grep -qF 'echo Turn on the bubbles!' $CRON_CONFIG_FILE || echo "${CRON} echo Turn on the bubbles!" >> $CRON_CONFIG_FILE
+grep -qF '@reboot' $CRON_CONFIG_FILE || echo "@reboot echo Let\'s get in the water again!" >> $CRON_CONFIG_FILE
+
+exec crond -f