Merge pull request '1.1.0' (#5) from develop into master

Reviewed-on: #5

.drone.yml

@@ -0,0 +1,176 @@
+kind: pipeline
+type: docker
+name: build-release-images
+trigger:
+  event:
+    exclude:
+    - pull_request
+  ref:
+    - refs/tags/**
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: get-tags
+  image: docker:git
+  commands:
+    - git fetch --tags
+  depends_on:
+    - clone
+
+- name: make-tags
+  image: node
+  commands:
+    - echo -n "${DRONE_TAG}, latest" > .tags
+  depends_on:
+    - get-tags
+
+- name: build-gitea
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: git.mrmeeb.stream
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: docker_password
+    repo: git.mrmeeb.stream/mrmeeb/certbot-cron
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: release-gitea
+  image: goreleaser/goreleaser
+  environment:
+    GITEA_TOKEN:
+      from_secret: gitea_token
+  commands:
+    - goreleaser release -f .goreleaser-gitea.yaml
+  depends_on:
+    - build-gitea
+
+- name: notify
+  image: plugins/slack
+  when:
+    status:
+    - success
+    - failure
+  settings:
+    webhook: 
+      from_secret: slack_webhook
+  depends_on:
+    - release-gitea
+
+---
+kind: pipeline
+type: docker
+name: build-main-images
+trigger:
+  event:
+    exclude:
+    - pull_request
+  ref:
+    - refs/heads/master
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: make-tags
+  image: node
+  commands:
+    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
+  when:
+    ref:
+      - refs/heads/master
+  depends_on:
+    - clone
+
+- name: build-gitea
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: git.mrmeeb.stream
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: docker_password
+    repo: git.mrmeeb.stream/mrmeeb/certbot-cron
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: notify
+  image: plugins/slack
+  when:
+    status:
+    - success
+    - failure
+  settings:
+    webhook: 
+      from_secret: slack_webhook
+  depends_on:
+    - build-gitea
+
+---
+kind: pipeline
+type: docker
+name: build-develop-images
+trigger:
+  event:
+    exclude:
+    - pull_request
+  branch:
+    - develop
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+  # Set tags for develop branch - git commit SHA and 'develop'
+- name: make-tags
+  image: node
+  commands:
+    - echo -n "develop-${DRONE_COMMIT_SHA:0:8}, develop" > .tags
+   
+  # Build containers from develop branch
+- name: build-gitea
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: git.mrmeeb.stream
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: docker_password
+    repo: git.mrmeeb.stream/mrmeeb/certbot-cron
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: notify
+  image: plugins/slack
+  when:
+    status:
+    - success
+    - failure
+  settings:
+    webhook: 
+      from_secret: slack_webhook
+  depends_on:
+    - build-gitea

.gitea/workflows/build-develop.yaml

@@ -1,88 +0,0 @@
-name: Build Image
-on:
-  push:
-    branches:
-      - 'develop'
-
-env:
-  TEST_TAG: mrmeeb/certbot-cron:test
-  FULL_TAG: git.mrmeeb.stream/mrmeeb/certbot-cron:develop
-
-jobs:
-  "Validate Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    steps:
-      - name: Build locally
-        uses: docker/build-push-action@v5
-        with:
-          load: true
-          tags: ${{ env.TEST_TAG }}
-          provenance: false
-      - name: Test certificate issuing
-        id: test
-        run: |
-          # First create a volume
-          docker volume create ${{ gitea.sha }} && \
-          # Then issue a certificate
-          docker run --rm -v ${{ gitea.sha }}:/config -e STAGING=true -e EMAIL=${{ secrets.EMAIL }} -e DOMAINS=${{ gitea.sha }}.mrmeeb.stream -e PLUGIN=cloudflare -e CLOUDFLARE_TOKEN=${{ secrets.CLOUDFLARE_TOKEN }} -e ONE_SHOT=true -e GENERATE_DHPARAM=false ${{ env.TEST_TAG }} && \
-          # Then revoke it again
-          docker run --rm --entrypoint "/usr/bin/certbot" -v ${{ gitea.sha }}:/config ${{ env.TEST_TAG }} revoke --non-interactive --agree-tos --email ${{ secrets.EMAIL }} --staging --config-dir /config/letsencrypt --work-dir /config/.tmp --logs-dir /config/logs --cert-path /config/letsencrypt/live/${{ gitea.sha }}.mrmeeb.stream/fullchain.pem          
-      - name: Tidy up
-        if: always()
-        run: |
-          echo "Removing docker volume ${{ gitea.sha }}" && \
-          docker volume rm ${{ gitea.sha }}          
-      - name: Test Failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Test Failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-  
-  "Publish Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Validate Image"]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.mrmeeb.stream
-          username: ${{ env.GITHUB_ACTOR }}
-          password: ${{ secrets.GTCR_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ env.FULL_TAG }}
-          provenance: false
-      - name: Build Failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Build Failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-
-  "Notify":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Build Image", "Validate Image"]
-    steps:
-      - name: Notify of success
-        uses: rjstone/discord-webhook-notify@v1
-        if: success()
-        with:
-          severity: info
-          details: Build succeeded!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}

.gitea/workflows/build-main.yaml

@@ -1,88 +0,0 @@
-name: Build Image
-on:
-  push:
-    branches:
-      - 'main'
-
-env:
-  TEST_TAG: mrmeeb/certbot-cron:test
-  FULL_TAG: git.mrmeeb.stream/mrmeeb/certbot-cron:latest
-
-jobs:
-  "Validate Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    steps:
-      - name: Build locally
-        uses: docker/build-push-action@v5
-        with:
-          load: true
-          tags: ${{ env.TEST_TAG }}
-          provenance: false
-      - name: Test certificate issuing
-        id: test
-        run: |
-          # First create a volume
-          docker volume create ${{ gitea.sha }} && \
-          # Then issue a certificate
-          docker run --rm -v ${{ gitea.sha }}:/config -e STAGING=true -e EMAIL=${{ secrets.EMAIL }} -e DOMAINS=${{ gitea.sha }}.mrmeeb.stream -e PLUGIN=cloudflare -e CLOUDFLARE_TOKEN=${{ secrets.CLOUDFLARE_TOKEN }} -e ONE_SHOT=true -e GENERATE_DHPARAM=false ${{ env.TEST_TAG }} && \
-          # Then revoke it again
-          docker run --rm --entrypoint "/usr/bin/certbot" -v ${{ gitea.sha }}:/config ${{ env.TEST_TAG }} revoke --non-interactive --agree-tos --email ${{ secrets.EMAIL }} --staging --config-dir /config/letsencrypt --work-dir /config/.tmp --logs-dir /config/logs --cert-path /config/letsencrypt/live/${{ gitea.sha }}.mrmeeb.stream/fullchain.pem          
-      - name: Tidy up
-        if: always()
-        run: |
-          echo "Removing docker volume ${{ gitea.sha }}" && \
-          docker volume rm ${{ gitea.sha }}          
-      - name: Test Failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Test Failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-  
-  "Publish Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Validate Image"]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.mrmeeb.stream
-          username: ${{ env.GITHUB_ACTOR }}
-          password: ${{ secrets.GTCR_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ env.FULL_TAG }}
-          provenance: false
-      - name: Build Failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Build Failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-
-  "Notify":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Build Image", "Validate Image"]
-    steps:
-      - name: Notify of success
-        uses: rjstone/discord-webhook-notify@v1
-        if: success()
-        with:
-          severity: info
-          details: Build succeeded!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}

.gitea/workflows/build-tagged-release.yaml

@@ -1,80 +0,0 @@
-name: Build Tagged Release Image
-on:
-  push:
-    tags:
-      - '*'
-
-env:
-  FULL_TAG: git.mrmeeb.stream/mrmeeb/certbot-cron
-
-jobs:
-  "Build Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.mrmeeb.stream
-          username: ${{ env.GITHUB_ACTOR }}
-          password: ${{ secrets.GTCR_TOKEN }}
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.FULL_TAG }}
-          tags: |
-            type=pep440,pattern={{version}}            
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.meta.outputs.tags }}
-          provenance: false
-      - name: Notify on failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Build failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-  "Create Release":
-    runs-on: ubuntu-latest
-    needs: ["Build Image"]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Set up Go
-        uses: actions/setup-go@v4
-        with: 
-          go-version: 1.22.2
-      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
-        with:
-          distribution: goreleaser
-          version: latest
-          args: release --clean -f .goreleaser-gitea.yaml
-        env:
-          GITEA_TOKEN: ${{ secrets.GORELEASER_TOKEN }}
-
-  "Notify":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Build Image", "Create Release"]
-    steps:
-      - name: Notify of success
-        uses: rjstone/discord-webhook-notify@v1
-        if: success()
-        with:
-          severity: info
-          details: Build succeeded!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}

.gitea/workflows/test-pr.yaml

@@ -1,47 +0,0 @@
-name: Test Pull Request
-on:
-  pull_request:
-    branches:
-      - 'main'
-      - 'develop'
-
-env:
-  FULL_TAG: git.mrmeeb.stream/mrmeeb/certbot-cron:develop
-
-jobs:
-  "Build Image":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build
-        uses: docker/build-push-action@v5
-        with:
-          push: false
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ env.FULL_TAG }}
-          provenance: false
-      - name: Notify on failure
-        uses: rjstone/discord-webhook-notify@v1
-        if: failure()
-        with:
-          severity: error
-          details: Build failed!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}
-  "Notify":
-    runs-on: [ubuntu-docker-latest, linux/amd64]
-    needs: ["Build Image"]
-    steps:
-      - name: Notify of success
-        uses: rjstone/discord-webhook-notify@v1
-        if: success()
-        with:
-          severity: info
-          details: Build succeeded!
-          webhookUrl: ${{ secrets.DISCORD_WEBHOOK }}
-          username: Gitea
-          avatarUrl: ${{ vars.RUNNER_ICON_URL }}

Dockerfile

@@ -17,7 +17,6 @@ ENV PGID=1000
 ENV TZ=UTC
 ENV GENERATE_DHPARAM=true
 ENV INTERVAL="0 */6 * * *"
-ENV ONE_SHOT=false
 
 # Single domain
 ENV DOMAINS=
@@ -56,10 +55,7 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 S6_VERBOSI
 RUN python3 -m venv /app/certbot/ && /app/certbot/bin/pip install --upgrade pip
 
 #Get required packages for building, build, then cleanup
-#Added additional pip steps to fix cython 3.0.0 issue - https://github.com/yaml/pyyaml/issues/601
 RUN apk add --no-cache --virtual .deps gcc python3-dev libc-dev libffi-dev && \
-    /app/certbot/bin/pip install wheel && \
-    /app/certbot/bin/pip install "Cython<3.0" pyyaml --no-build-isolation && \
     /app/certbot/bin/pip install certbot certbot-dns-cloudflare && \
     ln -s /app/certbot/bin/certbot /usr/bin/certbot &&\
     apk del .deps
@@ -69,7 +65,6 @@ COPY root /
 RUN chmod +x /container-init.sh && \
     chmod +x /certbot-prepare.sh && \
     chmod +x /certbot-renew.sh && \
-    chmod +x /check-one-shot.sh && \
     chown -R ${PUID}:${PGID} /app /config
 
 ENTRYPOINT [ "/init" ]

README.md

@@ -52,10 +52,9 @@ Core options to the container
 |PUID    |int    |1000   |Sets the UID of the user certbot runs under |
 |PGID    |int    |1000   |Sets the GID of the user certbot runs under |
 |TZ      |[List of valid TZs](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List)    |UTC    |Sets the timezone of the container |
-| ONE_SHOT | false | Whether container exits after first run of certbot, or starts cron-based auto-renewal |
 | GENERATE_DHPARAM | true (case-sensitive) | Generate Diffie-Hellman keys in /config/letsencrypt/keys |
 | INTERVAL | 0 */6 * * * | How often certbot attempts to renew the certificate. Cron syntax |
-| CERT_COUNT | 1 | How many certificates certbot will try to issue. [Details here](https://git.mrmeeb.stream/MrMeeb/certbot-cron-docker#multiple-certificates) |
+| CERT_COUNT | 1 | How many certificates certbot will try to issue (more than 1 not yet implemented) |
 
 ### Certificate Options
 

root/certbot-prepare.sh

@@ -756,24 +756,13 @@ fi
 
 if [ $GENERATE_DHPARAM = true ] && [ ! -s /config/letsencrypt/keys/ssl-dhparams.pem ]
 then
-    echo ""
     echo "Generating Diffie-Hellman keys, saved to /config/letsencrypt/keys. This can take a long time!"
     openssl dhparam -out /config/letsencrypt/keys/ssl-dhparams.pem 4096
 fi
 
-if [ $ONE_SHOT == "true" ]; then
+echo "$INTERVAL /certbot-renew.sh >> /config/logs/renew.log" > /config/.crontab.txt
 
-    echo ""
+echo ""
 
-    echo "ONE_SHOT is true - exiting container"
+echo "Starting automatic renewal job. Schedule is $INTERVAL"
-
+crontab /config/.crontab.txt
-elif [ $ONE_SHOT == "false" ]; then
-
-    echo "$INTERVAL /certbot-renew.sh >> /config/logs/renew.log" > /config/.crontab.txt
-
-    echo ""
-
-    echo "Starting automatic renewal job. Schedule is $INTERVAL"
-    crontab /config/.crontab.txt
-
-fi

root/check-one-shot.sh

@@ -1,9 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-if [ $ONE_SHOT == "true" ]; then
-
-    # Cleanly kill container by sending kill signal to supervisor process
-    kill 1
-
-fi

root/container-init.sh

@@ -28,7 +28,6 @@ echo \
 "PUID=${PUID}
 PGID=${PGID}
 TZ=${TZ}
-ONE_SHOT=${ONE_SHOT}
 INTERVAL=${INTERVAL}
 GENERATE_DHPARAM=${GENERATE_DHPARAM}
 CERT_COUNT=${CERT_COUNT}"

root/etc/s6-overlay/s6-rc.d/check-one-shot/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/check-one-shot/up

@@ -1 +0,0 @@
-exec /check-one-shot.sh