Skip to content

Commit 2f8c5b4

Browse files
authored
Merge branch 'master' into master
2 parents 973abbe + 9f75c7a commit 2f8c5b4

5 files changed

Lines changed: 191 additions & 168 deletions

File tree

Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ pipeline {
280280
echo "Jenkinsfile is up to date."
281281
fi
282282
# Stage 2 - Delete old templates
283-
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
283+
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
284284
for i in ${OLD_TEMPLATES}; do
285285
if [[ -f "${i}" ]]; then
286286
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -316,12 +316,13 @@ pipeline {
316316
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
317317
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
318318
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
319+
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
319320
cd ${TEMPDIR}/repo/${LS_REPO}/
320321
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
321322
echo ".jenkins-external" >> .gitignore
322323
git add .gitignore
323324
fi
324-
git add ${TEMPLATED_FILES}
325+
git add readme-vars.yml ${TEMPLATED_FILES}
325326
git commit -m 'Bot Updating Templated Files'
326327
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
327328
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ The architectures supported by this image are:
6868
* For `dns` validation, make sure to enter your credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`
6969
* Cloudflare provides free accounts for managing dns and is very easy to use with this image. Make sure that it is set up for "dns only" instead of "dns + proxy"
7070
* Google dns plugin is meant to be used with "Google Cloud DNS", a paid enterprise product, and not for "Google Domains DNS"
71-
* DuckDNS only supoprts two types of DNS validated certificates (not both at the same time):
71+
* DuckDNS only supports two types of DNS validated certificates (not both at the same time):
7272
1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
7373
2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
7474
* `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables

0 commit comments

Comments
 (0)