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/.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-dev.yml b/.gitea/workflows/docker-dev.yml new file mode 100644 index 0000000..6e36b5a --- /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/hottub: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..949973e --- /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/hottub:latest \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index fd9ccb4..a0fb62e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM alpine:latest -COPY . opt -RUN apk add --no-cache supercronic +COPY entrypoint.sh /opt 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..cc8e42a 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,7 +1,9 @@ #!/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 +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 supercronic -passthrough-logs -quiet $CRON_CONFIG_FILE \ No newline at end of file +exec crond -f \ No newline at end of file