diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2d72252a..83b56e03 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(echo '1.32.0') + EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/certbot/json" |jq -r '. | .info.version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for swag branch master" diff --git a/Dockerfile b/Dockerfile index ebea4905..67ae1b7c 100755 --- a/Dockerfile +++ b/Dockerfile @@ -94,7 +94,6 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ - acme==${CERTBOT_VERSION} \ certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ @@ -126,7 +125,6 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ - certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dae457d7..eb62ee57 100755 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -94,7 +94,6 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ - acme==${CERTBOT_VERSION} \ certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ @@ -126,7 +125,6 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ - certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index bf7e3eb0..7b81199b 100755 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -94,7 +94,6 @@ RUN \ pip \ wheel && \ pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \ - acme==${CERTBOT_VERSION} \ certbot==${CERTBOT_VERSION} \ certbot-dns-acmedns \ certbot-dns-aliyun \ @@ -126,7 +125,6 @@ RUN \ certbot-dns-njalla \ certbot-dns-nsone \ certbot-dns-ovh \ - certbot-dns-porkbun \ certbot-dns-rfc2136 \ certbot-dns-route53 \ certbot-dns-sakuracloud \ diff --git a/Jenkinsfile b/Jenkinsfile index 0b15c7ef..e07918cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -100,18 +100,17 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a custom command to determine version use that command - stage("Set tag custom bash"){ + // If this is a pip release set the external tag to the pip version + stage("Set ENV pip_version"){ steps{ script{ env.EXT_RELEASE = sh( - script: ''' echo '1.32.0' ''', + script: '''curl -sL https://pypi.python.org/pypi/${EXT_PIP}/json |jq -r '. | .info.version' ''', returnStdout: true).trim() - env.RELEASE_LINK = 'custom_command' + env.RELEASE_LINK = 'https://pypi.python.org/pypi/' + env.EXT_PIP } } - } - // Sanitize the release tag and strip illegal docker or github characters + } // Sanitize the release tag and strip illegal docker or github characters stage("Sanitize tag"){ steps{ script{ @@ -912,11 +911,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json + echo "Updating PIP version of ${EXT_PIP} to ${EXT_RELEASE_CLEAN}" > releasebody.json echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "master",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' diff --git a/README.md b/README.md index e437d07c..1c74f796 100755 --- a/README.md +++ b/README.md @@ -335,6 +335,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.01.23:** - Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x. * **20.01.23:** - Rebase to alpine 3.17 with php8.1. * **16.01.23:** - Remove nchan module because it keeps causing crashes. * **08.12.22:** - Revamp certbot init. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 360792bf..989b638c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,12 +2,7 @@ # jenkins variables project_name: docker-swag - -# Pin certbot to 1.32.0 until plugin compatibility improves -external_type: na -custom_version_command: "echo '1.32.0'" - -#external_type: pip_version +external_type: pip_version release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index afdd04f3..040a324d 100755 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -154,6 +154,7 @@ app_setup_block: | # changelog changelogs: + - { date: "21.01.23:", desc: "Unpin certbot version (allow certbot 2.x). !!BREAKING CHANGE!! We are temporarily removing the certbot porkbun plugin until a new version is released that is compatible with certbot 2.x." } - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - { date: "16.01.23:", desc: "Remove nchan module because it keeps causing crashes." } - { date: "08.12.22:", desc: "Revamp certbot init."} diff --git a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run index 5e468eb8..159788d1 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run @@ -24,7 +24,7 @@ for i in "${SANED_VARS[@]}"; do done # check to make sure DNSPLUGIN is selected if dns validation is used -if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|porkbun|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then +if [[ "${VALIDATION}" = "dns" ]] && [[ ! "${DNSPLUGIN}" =~ ^(acmedns|aliyun|azure|cloudflare|cpanel|desec|digitalocean|directadmin|dnsimple|dnsmadeeasy|dnspod|do|domeneshop|duckdns|dynu|gandi|gehirn|godaddy|google|he|hetzner|infomaniak|inwx|ionos|linode|loopia|luadns|netcup|njalla|nsone|ovh|rfc2136|route53|sakuracloud|standalone|transip|vultr)$ ]]; then echo "Please set the DNSPLUGIN variable to a valid plugin name. See docker info for more details." sleep infinity fi