From 289c1cac72f2f17a4d7cc447a58b3088a146d76d Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 12:26:38 -0500 Subject: [PATCH 01/12] adjusted cron --- Dockerfile | 2 +- entrypoint.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd9ccb4..fa6627a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:latest COPY . opt -RUN apk add --no-cache supercronic +RUN apk add --no-cache cronie 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 a09eb11..391b7aa 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,5 @@ #!/bin/sh -CRON_CONFIG_FILE="/opt/crontab" +CRON_CONFIG_FILE="/etc/crontabs/root" -echo "${CRON} echo Come in the water is fine. >/dev/null" > $CRON_CONFIG_FILE - -exec supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE \ No newline at end of file +echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE \ No newline at end of file -- 2.52.0 From 22fea0b24d228dad3898d28b2231664926d9cc51 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 13:02:24 -0500 Subject: [PATCH 02/12] migrate to gitea actions --- .drone.yml | 31 ------------------------------- .gitea/workflows/docker.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 31 deletions(-) delete mode 100644 .drone.yml create mode 100644 .gitea/workflows/docker.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index a9bcaac..0000000 --- a/.drone.yml +++ /dev/null @@ -1,31 +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/hottub - tags: - - latest - when: - branch: - - main -- 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/hottub - tags: - - dev - when: - branch: - - 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..1990c12 --- /dev/null +++ b/.gitea/workflows/docker.yml @@ -0,0 +1,27 @@ +name: Build and Deploy docker container + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout main + uses: actions/checkout@v4 + - name: Set up Docker Buildx + 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 + with: + context: . + push: true + tags: 'git.jonb.io/jblu/hottub:latest' \ No newline at end of file -- 2.52.0 From 5c73549e1c21b5bdec9e70e24c2965f9af821ea5 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 13:08:34 -0500 Subject: [PATCH 03/12] add dev build --- .gitea/workflows/docker-dev.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .gitea/workflows/docker-dev.yml diff --git a/.gitea/workflows/docker-dev.yml b/.gitea/workflows/docker-dev.yml new file mode 100644 index 0000000..8a52e94 --- /dev/null +++ b/.gitea/workflows/docker-dev.yml @@ -0,0 +1,27 @@ +name: Build and Deploy docker container + +on: + push: + branches: + - dev* + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout main + uses: actions/checkout@v4 + - name: Set up Docker Buildx + 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 + with: + context: . + push: true + tags: 'git.jonb.io/jblu/hottub:dev' \ No newline at end of file -- 2.52.0 From 5a8511c8cccf7115ccf9b96fbc3ca0694352193a Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 13:12:51 -0500 Subject: [PATCH 04/12] updated buildx action --- .gitea/workflows/docker-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker-dev.yml b/.gitea/workflows/docker-dev.yml index 8a52e94..da04aae 100644 --- a/.gitea/workflows/docker-dev.yml +++ b/.gitea/workflows/docker-dev.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout main uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to Docker Hub uses: docker/login-action@v3 with: -- 2.52.0 From e9a8b99c20eafc9d753434872b7cc0a9950e021f Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 13:13:20 -0500 Subject: [PATCH 05/12] updated buildx version --- .gitea/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 1990c12..34ceecb 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout main uses: actions/checkout@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Login to Docker Hub uses: docker/login-action@v3 with: -- 2.52.0 From e1760f73b5dcc3e072e5965f7a0ac18669d5f267 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 13:27:54 -0500 Subject: [PATCH 06/12] updated ci --- .gitea/workflows/docker-dev.yml | 27 +++++++++++++++------------ .gitea/workflows/docker.yml | 27 +++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/docker-dev.yml b/.gitea/workflows/docker-dev.yml index da04aae..6e36b5a 100644 --- a/.gitea/workflows/docker-dev.yml +++ b/.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: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - name: Login to Docker Hub - uses: docker/login-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v4 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' \ No newline at end of file + tags: git.jonb.io/jblu/hottub:dev \ No newline at end of file diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 34ceecb..949973e 100644 --- a/.gitea/workflows/docker.yml +++ b/.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: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 - - name: Login to Docker Hub - uses: docker/login-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v4 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' \ No newline at end of file + tags: git.jonb.io/jblu/hottub:latest \ No newline at end of file -- 2.52.0 From 47fff33a0de07dcb2302ddfde7b6484b6074bd7d Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 16:40:25 -0500 Subject: [PATCH 07/12] updated entrypoint --- entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 391b7aa..f883677 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,4 +2,6 @@ CRON_CONFIG_FILE="/etc/crontabs/root" -echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE \ No newline at end of file +echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE + +exec sleep infinity \ No newline at end of file -- 2.52.0 From 1d87e47295427c00cfa13786094d8ec4439895ea Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 16:55:18 -0500 Subject: [PATCH 08/12] testing different crons --- entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index f883677..5c38794 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,5 +3,7 @@ CRON_CONFIG_FILE="/etc/crontabs/root" echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE +echo "${CRON} echo "Come in the water is fine!" > $CRON_CONFIG_FILE +echo "@reboot echo "Come in the water is fine!" > /opt/reboot.log" > $CRON_CONFIG_FILE -exec sleep infinity \ No newline at end of file +exec crond -f \ No newline at end of file -- 2.52.0 From 564264dbbe32469c371f50005d50b6eaac1779ec Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 16:59:29 -0500 Subject: [PATCH 09/12] fixed entrypoint and changed to not install cronie --- Dockerfile | 2 +- entrypoint.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa6627a..0d5af90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:latest COPY . opt -RUN apk add --no-cache cronie +# RUN apk add --no-cache cronie 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 5c38794..12fd5a3 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,8 +2,8 @@ CRON_CONFIG_FILE="/etc/crontabs/root" -echo "${CRON} echo "Come in the water is fine!" > /opt/output.log" > $CRON_CONFIG_FILE -echo "${CRON} echo "Come in the water is fine!" > $CRON_CONFIG_FILE -echo "@reboot echo "Come in the water is fine!" > /opt/reboot.log" > $CRON_CONFIG_FILE +echo "${CRON} echo Come in the water is fine! > /opt/output.log" > $CRON_CONFIG_FILE +echo "${CRON} echo Come in the water is fine! > /opt/output.log" > $CRON_CONFIG_FILE +echo "@reboot echo Come in the water is fine! > /opt/reboot.log" > $CRON_CONFIG_FILE exec crond -f \ No newline at end of file -- 2.52.0 From e929d68f3f1ca6241626d8170104df606f017b66 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 17:03:03 -0500 Subject: [PATCH 10/12] adjusted crontab --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 12fd5a3..d47a94a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -3,7 +3,7 @@ CRON_CONFIG_FILE="/etc/crontabs/root" echo "${CRON} echo Come in the water is fine! > /opt/output.log" > $CRON_CONFIG_FILE -echo "${CRON} echo Come in the water is fine! > /opt/output.log" > $CRON_CONFIG_FILE +echo "${CRON} echo Turn on the bubbles!" > $CRON_CONFIG_FILE echo "@reboot echo Come in the water is fine! > /opt/reboot.log" > $CRON_CONFIG_FILE exec crond -f \ No newline at end of file -- 2.52.0 From 56a887c0fbe9a24d9dd914c3e011284b853a1649 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 17:04:06 -0500 Subject: [PATCH 11/12] updated crontabs --- entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index d47a94a..cc8e42a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,8 +2,8 @@ CRON_CONFIG_FILE="/etc/crontabs/root" -echo "${CRON} echo Come in the water is fine! > /opt/output.log" > $CRON_CONFIG_FILE -echo "${CRON} echo Turn on the bubbles!" > $CRON_CONFIG_FILE -echo "@reboot echo Come in the water is fine! > /opt/reboot.log" > $CRON_CONFIG_FILE +echo "${CRON} echo Come in the water is fine! > /opt/output.log" >> $CRON_CONFIG_FILE +echo "${CRON} echo Turn on the bubbles!" >> $CRON_CONFIG_FILE +echo "@reboot echo Come in the water is fine! > /opt/reboot.log" >> $CRON_CONFIG_FILE exec crond -f \ No newline at end of file -- 2.52.0 From e83151f74fcf4612c09d8a73888efda01ecbaf62 Mon Sep 17 00:00:00 2001 From: jblu Date: Wed, 8 Apr 2026 17:10:17 -0500 Subject: [PATCH 12/12] updated docker file --- .dockerignore | 1 - Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index faa07ee..7b95fc6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ .gitignore LICENSE README.md -.drone.yml Dockerfile \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0d5af90..a0fb62e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:latest -COPY . opt -# RUN apk add --no-cache cronie +COPY entrypoint.sh /opt RUN chmod +x /opt/entrypoint.sh CMD ["/opt/entrypoint.sh"] \ No newline at end of file -- 2.52.0