mirror of
https://github.com/linuxserver/docker-swag.git
synced 2026-03-20 04:59:03 +09:00
Compare commits
12 Commits
2.11.0-ls3
...
2.11.0-ls3
| Author | SHA1 | Date | |
|---|---|---|---|
|
1c052fdd0d | ||
|
|
b569c84976 | ||
|
|
c14b42f85d | ||
|
|
60b6827133 | ||
|
|
cef4d471e1 | ||
|
|
eaafc4393b | ||
|
|
94c72584a7 | ||
|
|
59d1c8a724 | ||
|
|
ed0c949267 | ||
|
|
5027f6f7b3 | ||
|
502d10303c | ||
|
|
00afe35e21 |
64
.github/workflows/external_trigger.yml
vendored
64
.github/workflows/external_trigger.yml
vendored
@@ -11,15 +11,17 @@ jobs:
|
|||||||
|
|
||||||
- name: External Trigger
|
- name: External Trigger
|
||||||
if: github.ref == 'refs/heads/master'
|
if: github.ref == 'refs/heads/master'
|
||||||
|
env:
|
||||||
|
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
|
||||||
run: |
|
run: |
|
||||||
printf "# External trigger for docker-swag\n\n" >> $GITHUB_STEP_SUMMARY
|
printf "# External trigger for docker-swag\n\n" >> $GITHUB_STEP_SUMMARY
|
||||||
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER }}" ]; then
|
if grep -q "^swag_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
|
||||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "> Github secret \`PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`swag_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "> External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_SWAG_MASTER\`" >> $GITHUB_STEP_SUMMARY
|
echo "> External trigger running off of master branch. To disable this trigger, add \`swag_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
|
||||||
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
|
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
|
||||||
EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/certbot/json" |jq -r '. | .info.version')
|
EXT_RELEASE=$(curl -sL "https://pypi.python.org/pypi/certbot/json" |jq -r '. | .info.version')
|
||||||
echo "Type is \`pip_version\`" >> $GITHUB_STEP_SUMMARY
|
echo "Type is \`pip_version\`" >> $GITHUB_STEP_SUMMARY
|
||||||
@@ -78,26 +80,38 @@ jobs:
|
|||||||
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
|
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
|
||||||
exit 0
|
exit 0
|
||||||
else
|
else
|
||||||
printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
|
if [[ "${artifacts_found}" == "false" ]]; then
|
||||||
echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
|
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||||
response=$(curl -iX POST \
|
echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
|
||||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/buildWithParameters?PACKAGE_CHECK=false \
|
FAILURE_REASON="New version ${EXT_RELEASE} for swag tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
||||||
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
|
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
|
||||||
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
|
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
sleep 10
|
else
|
||||||
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
|
||||||
buildurl="${buildurl%$'\r'}"
|
echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
|
if "${artifacts_found}" == "true" ]]; then
|
||||||
echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
|
echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
|
||||||
curl -iX POST \
|
fi
|
||||||
"${buildurl}submitDescription" \
|
response=$(curl -iX POST \
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
|
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/buildWithParameters?PACKAGE_CHECK=false \
|
||||||
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||||
--data-urlencode "Submit=Submit"
|
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
|
||||||
echo "**** Notifying Discord ****"
|
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
|
||||||
TRIGGER_REASON="A version change was detected for swag tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
|
sleep 10
|
||||||
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
||||||
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
|
buildurl="${buildurl%$'\r'}"
|
||||||
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
|
||||||
|
curl -iX POST \
|
||||||
|
"${buildurl}submitDescription" \
|
||||||
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
|
||||||
|
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
||||||
|
--data-urlencode "Submit=Submit"
|
||||||
|
echo "**** Notifying Discord ****"
|
||||||
|
TRIGGER_REASON="A version change was detected for swag tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
|
||||||
|
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
||||||
|
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
|
||||||
|
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
42
.github/workflows/package_trigger.yml
vendored
42
.github/workflows/package_trigger.yml
vendored
@@ -1,42 +0,0 @@
|
|||||||
name: Package Trigger Main
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
package-trigger-master:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4.1.1
|
|
||||||
|
|
||||||
- name: Package Trigger
|
|
||||||
if: github.ref == 'refs/heads/master'
|
|
||||||
run: |
|
|
||||||
printf "# Package trigger for docker-swag\n\n" >> $GITHUB_STEP_SUMMARY
|
|
||||||
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_SWAG_MASTER }}" ]; then
|
|
||||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_SWAG_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
|
||||||
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "> Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_SWAG_MASTER\`" >> $GITHUB_STEP_SUMMARY
|
|
||||||
response=$(curl -iX POST \
|
|
||||||
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/buildWithParameters?PACKAGE_CHECK=true \
|
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
|
||||||
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
|
|
||||||
sleep 10
|
|
||||||
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
|
||||||
buildurl="${buildurl%$'\r'}"
|
|
||||||
echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
|
|
||||||
echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
|
|
||||||
curl -iX POST \
|
|
||||||
"${buildurl}submitDescription" \
|
|
||||||
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
|
|
||||||
--data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
|
||||||
--data-urlencode "Submit=Submit"
|
|
||||||
66
.github/workflows/package_trigger_scheduler.yml
vendored
66
.github/workflows/package_trigger_scheduler.yml
vendored
@@ -14,6 +14,8 @@ jobs:
|
|||||||
fetch-depth: '0'
|
fetch-depth: '0'
|
||||||
|
|
||||||
- name: Package Trigger Scheduler
|
- name: Package Trigger Scheduler
|
||||||
|
env:
|
||||||
|
SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
|
||||||
run: |
|
run: |
|
||||||
printf "# Package trigger scheduler for docker-swag\n\n" >> $GITHUB_STEP_SUMMARY
|
printf "# Package trigger scheduler for docker-swag\n\n" >> $GITHUB_STEP_SUMMARY
|
||||||
printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
|
printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
|
||||||
@@ -24,27 +26,57 @@ jobs:
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
|
printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
|
||||||
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-swag/${br}/jenkins-vars.yml | yq -r '.ls_branch')
|
JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-swag/${br}/jenkins-vars.yml)
|
||||||
if [ "${br}" == "${ls_branch}" ]; then
|
if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
|
||||||
echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
|
echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
|
||||||
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-swag/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
|
if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
|
||||||
echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
|
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||||
triggered_branches="${triggered_branches}${br} "
|
echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
|
||||||
curl -iX POST \
|
skipped_branches="${skipped_branches}${br} "
|
||||||
-H "Authorization: token ${{ secrets.CR_PAT }}" \
|
elif grep -q "^swag_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
|
||||||
-H "Accept: application/vnd.github.v3+json" \
|
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||||
-d "{\"ref\":\"refs/heads/${br}\"}" \
|
echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`swag_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
|
||||||
https://api.github.com/repos/linuxserver/docker-swag/actions/workflows/package_trigger.yml/dispatches
|
skipped_branches="${skipped_branches}${br} "
|
||||||
sleep 30
|
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then
|
||||||
|
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
skipped_branches="${skipped_branches}${br} "
|
||||||
else
|
else
|
||||||
echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
|
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
printf "> To disable, add \`swag_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
|
||||||
|
triggered_branches="${triggered_branches}${br} "
|
||||||
|
response=$(curl -iX POST \
|
||||||
|
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
|
||||||
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
|
||||||
|
echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
|
||||||
|
sleep 10
|
||||||
|
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
|
||||||
|
buildurl="${buildurl%$'\r'}"
|
||||||
|
echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
|
||||||
|
echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
|
||||||
|
curl -iX POST \
|
||||||
|
"${buildurl}submitDescription" \
|
||||||
|
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
|
||||||
|
--data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
|
||||||
|
--data-urlencode "Submit=Submit"
|
||||||
|
sleep 20
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
|
echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
|
if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
|
||||||
echo "**** Notifying Discord ****"
|
if [[ -n "${triggered_branches}" ]]; then
|
||||||
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
|
||||||
"description": "**Package Check Build(s) Triggered for swag** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-swag/activity/"' \n"}],
|
fi
|
||||||
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
if [[ -n "${skipped_branches}" ]]; then
|
||||||
|
NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
|
||||||
|
fi
|
||||||
|
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
|
||||||
|
echo "**** Notifying Discord ****"
|
||||||
|
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
|
||||||
|
"description": "**Package Check Build(s) Triggered for swag** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-swag/activity/"' \n"}],
|
||||||
|
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
|
||||||
|
fi
|
||||||
|
|||||||
60
Jenkinsfile
vendored
60
Jenkinsfile
vendored
@@ -82,7 +82,7 @@ pipeline {
|
|||||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
||||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||||
env.PULL_REQUEST = env.CHANGE_ID
|
env.PULL_REQUEST = env.CHANGE_ID
|
||||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
|
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./root/donate.txt'
|
||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
|
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
|
||||||
@@ -311,7 +311,7 @@ pipeline {
|
|||||||
echo "Jenkinsfile is up to date."
|
echo "Jenkinsfile is up to date."
|
||||||
fi
|
fi
|
||||||
echo "Starting Stage 2 - Delete old templates"
|
echo "Starting Stage 2 - Delete old templates"
|
||||||
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"
|
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 .github/workflows/package_trigger.yml"
|
||||||
for i in ${OLD_TEMPLATES}; do
|
for i in ${OLD_TEMPLATES}; do
|
||||||
if [[ -f "${i}" ]]; then
|
if [[ -f "${i}" ]]; then
|
||||||
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
||||||
@@ -719,6 +719,14 @@ pipeline {
|
|||||||
}
|
}
|
||||||
sh '''#! /bin/bash
|
sh '''#! /bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
|
||||||
|
echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
|
||||||
|
if [ -n "${CI_DOCKERENV}" ]; then
|
||||||
|
CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
|
||||||
|
else
|
||||||
|
CI_DOCKERENV="LSIO_FIRST_PARTY=true"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
docker pull ghcr.io/linuxserver/ci:latest
|
docker pull ghcr.io/linuxserver/ci:latest
|
||||||
if [ "${MULTIARCH}" == "true" ]; then
|
if [ "${MULTIARCH}" == "true" ]; then
|
||||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
||||||
@@ -731,6 +739,7 @@ pipeline {
|
|||||||
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
|
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
|
||||||
-e TAGS=\"${CI_TAGS}\" \
|
-e TAGS=\"${CI_TAGS}\" \
|
||||||
-e META_TAG=\"${META_TAG}\" \
|
-e META_TAG=\"${META_TAG}\" \
|
||||||
|
-e RELEASE_TAG=\"latest\" \
|
||||||
-e PORT=\"${CI_PORT}\" \
|
-e PORT=\"${CI_PORT}\" \
|
||||||
-e SSL=\"${CI_SSL}\" \
|
-e SSL=\"${CI_SSL}\" \
|
||||||
-e BASE=\"${DIST_IMAGE}\" \
|
-e BASE=\"${DIST_IMAGE}\" \
|
||||||
@@ -740,6 +749,7 @@ pipeline {
|
|||||||
-e WEB_SCREENSHOT=\"${CI_WEB}\" \
|
-e WEB_SCREENSHOT=\"${CI_WEB}\" \
|
||||||
-e WEB_AUTH=\"${CI_AUTH}\" \
|
-e WEB_AUTH=\"${CI_AUTH}\" \
|
||||||
-e WEB_PATH=\"${CI_WEBPATH}\" \
|
-e WEB_PATH=\"${CI_WEBPATH}\" \
|
||||||
|
-e NODE_NAME=\"${NODE_NAME}\" \
|
||||||
-t ghcr.io/linuxserver/ci:latest \
|
-t ghcr.io/linuxserver/ci:latest \
|
||||||
python3 test_build.py'''
|
python3 test_build.py'''
|
||||||
}
|
}
|
||||||
@@ -1007,17 +1017,45 @@ EOF
|
|||||||
git config --global --unset commit.gpgsign
|
git config --global --unset commit.gpgsign
|
||||||
'''
|
'''
|
||||||
script{
|
script{
|
||||||
|
env.JOB_DATE = sh(
|
||||||
|
script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
|
||||||
|
returnStdout: true).trim()
|
||||||
if (env.EXIT_STATUS == "ABORTED"){
|
if (env.EXIT_STATUS == "ABORTED"){
|
||||||
sh 'echo "build aborted"'
|
sh 'echo "build aborted"'
|
||||||
}
|
}else{
|
||||||
else if (currentBuild.currentResult == "SUCCESS"){
|
if (currentBuild.currentResult == "SUCCESS"){
|
||||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
|
if (env.GITHUBIMAGE =~ /lspipepr/){
|
||||||
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
|
env.JOB_WEBHOOK_STATUS='Success'
|
||||||
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
|
env.JOB_WEBHOOK_COLOUR=3957028
|
||||||
}
|
env.JOB_WEBHOOK_FOOTER='PR Build'
|
||||||
else {
|
}else if (env.GITHUBIMAGE =~ /lsiodev/){
|
||||||
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
|
env.JOB_WEBHOOK_STATUS='Success'
|
||||||
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
|
env.JOB_WEBHOOK_COLOUR=3957028
|
||||||
|
env.JOB_WEBHOOK_FOOTER='Dev Build'
|
||||||
|
}else{
|
||||||
|
env.JOB_WEBHOOK_STATUS='Success'
|
||||||
|
env.JOB_WEBHOOK_COLOUR=1681177
|
||||||
|
env.JOB_WEBHOOK_FOOTER='Live Build'
|
||||||
|
}
|
||||||
|
}else{
|
||||||
|
if (env.GITHUBIMAGE =~ /lspipepr/){
|
||||||
|
env.JOB_WEBHOOK_STATUS='Failure'
|
||||||
|
env.JOB_WEBHOOK_COLOUR=12669523
|
||||||
|
env.JOB_WEBHOOK_FOOTER='PR Build'
|
||||||
|
}else if (env.GITHUBIMAGE =~ /lsiodev/){
|
||||||
|
env.JOB_WEBHOOK_STATUS='Failure'
|
||||||
|
env.JOB_WEBHOOK_COLOUR=12669523
|
||||||
|
env.JOB_WEBHOOK_FOOTER='Dev Build'
|
||||||
|
}else{
|
||||||
|
env.JOB_WEBHOOK_STATUS='Failure'
|
||||||
|
env.JOB_WEBHOOK_COLOUR=16711680
|
||||||
|
env.JOB_WEBHOOK_FOOTER='Live Build'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
|
||||||
|
"footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
|
||||||
|
"timestamp": "'${JOB_DATE}'",\
|
||||||
|
"description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
|
||||||
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
|
"username": "Jenkins"}' ${BUILDS_DISCORD} '''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -375,7 +375,8 @@ Below are the instructions for updating containers:
|
|||||||
|
|
||||||
### Image Update Notifications - Diun (Docker Image Update Notifier)
|
### Image Update Notifications - Diun (Docker Image Update Notifier)
|
||||||
|
|
||||||
**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
|
>[!TIP]
|
||||||
|
>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
|
||||||
|
|
||||||
## Building locally
|
## Building locally
|
||||||
|
|
||||||
@@ -400,6 +401,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **30.08.24:** - Fix zerossl cert revocation.
|
||||||
* **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings.
|
* **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings.
|
||||||
* **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work.
|
* **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work.
|
||||||
* **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`.
|
* **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`.
|
||||||
|
|||||||
@@ -4,25 +4,25 @@ acme 2.11.0 python
|
|||||||
alpine-baselayout 3.6.5-r0 apk
|
alpine-baselayout 3.6.5-r0 apk
|
||||||
alpine-baselayout-data 3.6.5-r0 apk
|
alpine-baselayout-data 3.6.5-r0 apk
|
||||||
alpine-keys 2.4-r1 apk
|
alpine-keys 2.4-r1 apk
|
||||||
alpine-release 3.20.2-r0 apk
|
alpine-release 3.20.3-r0 apk
|
||||||
aom-libs 3.9.1-r0 apk
|
aom-libs 3.9.1-r0 apk
|
||||||
apache2-utils 2.4.62-r0 apk
|
apache2-utils 2.4.62-r0 apk
|
||||||
apk-tools 2.14.4-r0 apk
|
apk-tools 2.14.4-r0 apk
|
||||||
apr 1.7.4-r0 apk
|
apr 1.7.5-r0 apk
|
||||||
apr-util 1.6.3-r1 apk
|
apr-util 1.6.3-r1 apk
|
||||||
argon2-libs 20190702-r5 apk
|
argon2-libs 20190702-r5 apk
|
||||||
attrs 24.2.0 python
|
attrs 24.2.0 python
|
||||||
autocommand 2.2.2 python
|
autocommand 2.2.2 python
|
||||||
azure-common 1.1.28 python
|
azure-common 1.1.28 python
|
||||||
azure-core 1.30.2 python
|
azure-core 1.31.0 python
|
||||||
azure-identity 1.17.1 python
|
azure-identity 1.18.0 python
|
||||||
azure-mgmt-core 1.4.0 python
|
azure-mgmt-core 1.4.0 python
|
||||||
azure-mgmt-dns 8.1.0 python
|
azure-mgmt-dns 8.1.0 python
|
||||||
backports-tarfile 1.2.0 python
|
backports-tarfile 1.2.0 python
|
||||||
bash 5.2.26-r0 apk
|
bash 5.2.26-r0 apk
|
||||||
beautifulsoup4 4.12.3 python
|
beautifulsoup4 4.12.3 python
|
||||||
boto3 1.35.10 python
|
boto3 1.35.34 python
|
||||||
botocore 1.35.10 python
|
botocore 1.35.34 python
|
||||||
brotli-libs 1.1.0-r2 apk
|
brotli-libs 1.1.0-r2 apk
|
||||||
bs4 0.0.2 python
|
bs4 0.0.2 python
|
||||||
busybox 1.36.1-r29 apk
|
busybox 1.36.1-r29 apk
|
||||||
@@ -78,18 +78,18 @@ certbot-dns-transip 0.5.2 python
|
|||||||
certbot-dns-vultr 1.1.0 python
|
certbot-dns-vultr 1.1.0 python
|
||||||
certbot-plugin-gandi 1.5.0 python
|
certbot-plugin-gandi 1.5.0 python
|
||||||
certifi 2024.8.30 python
|
certifi 2024.8.30 python
|
||||||
cffi 1.17.0 python
|
cffi 1.17.1 python
|
||||||
charset-normalizer 3.3.2 python
|
charset-normalizer 3.3.2 python
|
||||||
cloudflare 2.19.4 python
|
cloudflare 2.19.4 python
|
||||||
composer 2.7.8 binary
|
composer 2.7.9 binary
|
||||||
configargparse 1.7 python
|
configargparse 1.7 python
|
||||||
configobj 5.0.8 python
|
configobj 5.0.9 python
|
||||||
coreutils 9.5-r1 apk
|
coreutils 9.5-r1 apk
|
||||||
coreutils-env 9.5-r1 apk
|
coreutils-env 9.5-r1 apk
|
||||||
coreutils-fmt 9.5-r1 apk
|
coreutils-fmt 9.5-r1 apk
|
||||||
coreutils-sha512sum 9.5-r1 apk
|
coreutils-sha512sum 9.5-r1 apk
|
||||||
cryptography 43.0.0 python
|
cryptography 43.0.1 python
|
||||||
curl 8.9.0-r0 apk
|
curl 8.9.1-r2 apk
|
||||||
distro 1.9.0 python
|
distro 1.9.0 python
|
||||||
dns-lexicon 3.18.0 python
|
dns-lexicon 3.18.0 python
|
||||||
dnslib 0.9.25 python
|
dnslib 0.9.25 python
|
||||||
@@ -98,7 +98,7 @@ domeneshop 0.4.4 python
|
|||||||
fail2ban 1.1.0 python
|
fail2ban 1.1.0 python
|
||||||
fail2ban 1.1.0-r0 apk
|
fail2ban 1.1.0-r0 apk
|
||||||
fail2ban-pyc 1.1.0-r0 apk
|
fail2ban-pyc 1.1.0-r0 apk
|
||||||
filelock 3.15.4 python
|
filelock 3.16.1 python
|
||||||
findutils 4.9.0-r5 apk
|
findutils 4.9.0-r5 apk
|
||||||
fontconfig 2.15.0-r1 apk
|
fontconfig 2.15.0-r1 apk
|
||||||
freetype 2.13.2-r0 apk
|
freetype 2.13.2-r0 apk
|
||||||
@@ -115,9 +115,9 @@ gnupg-keyboxd 2.4.5-r0 apk
|
|||||||
gnupg-utils 2.4.5-r0 apk
|
gnupg-utils 2.4.5-r0 apk
|
||||||
gnupg-wks-client 2.4.5-r0 apk
|
gnupg-wks-client 2.4.5-r0 apk
|
||||||
gnutls 3.8.5-r0 apk
|
gnutls 3.8.5-r0 apk
|
||||||
google-api-core 2.19.2 python
|
google-api-core 2.20.0 python
|
||||||
google-api-python-client 2.143.0 python
|
google-api-python-client 2.147.0 python
|
||||||
google-auth 2.34.0 python
|
google-auth 2.35.0 python
|
||||||
google-auth-httplib2 0.2.0 python
|
google-auth-httplib2 0.2.0 python
|
||||||
googleapis-common-protos 1.65.0 python
|
googleapis-common-protos 1.65.0 python
|
||||||
gpg 2.4.5-r0 apk
|
gpg 2.4.5-r0 apk
|
||||||
@@ -128,13 +128,14 @@ gpgv 2.4.5-r0 apk
|
|||||||
httplib2 0.22.0 python
|
httplib2 0.22.0 python
|
||||||
icu-data-en 74.2-r0 apk
|
icu-data-en 74.2-r0 apk
|
||||||
icu-libs 74.2-r0 apk
|
icu-libs 74.2-r0 apk
|
||||||
idna 3.8 python
|
idna 3.10 python
|
||||||
importlib-metadata 8.0.0 python
|
importlib-metadata 8.0.0 python
|
||||||
importlib-resources 6.4.0 python
|
importlib-resources 6.4.0 python
|
||||||
inflect 7.3.1 python
|
inflect 7.3.1 python
|
||||||
iptables 1.8.10-r3 apk
|
iptables 1.8.10-r3 apk
|
||||||
iptables-legacy 1.8.10-r3 apk
|
iptables-legacy 1.8.10-r3 apk
|
||||||
isodate 0.6.1 python
|
isodate 0.6.1 python
|
||||||
|
jaraco-collections 5.1.0 python
|
||||||
jaraco-context 5.3.0 python
|
jaraco-context 5.3.0 python
|
||||||
jaraco-functools 4.0.1 python
|
jaraco-functools 4.0.1 python
|
||||||
jaraco-text 3.12.1 python
|
jaraco-text 3.12.1 python
|
||||||
@@ -142,19 +143,19 @@ jmespath 1.0.1 python
|
|||||||
josepy 1.14.0 python
|
josepy 1.14.0 python
|
||||||
jq 1.7.1-r0 apk
|
jq 1.7.1-r0 apk
|
||||||
jsonlines 4.0.0 python
|
jsonlines 4.0.0 python
|
||||||
jsonpickle 3.2.2 python
|
jsonpickle 3.3.0 python
|
||||||
libacl 2.3.2-r0 apk
|
libacl 2.3.2-r0 apk
|
||||||
libassuan 2.5.7-r0 apk
|
libassuan 2.5.7-r0 apk
|
||||||
libattr 2.5.2-r0 apk
|
libattr 2.5.2-r0 apk
|
||||||
libavif 1.0.4-r0 apk
|
libavif 1.0.4-r0 apk
|
||||||
libbsd 0.12.2-r0 apk
|
libbsd 0.12.2-r0 apk
|
||||||
libbz2 1.0.8-r6 apk
|
libbz2 1.0.8-r6 apk
|
||||||
libcrypto3 3.3.1-r3 apk
|
libcrypto3 3.3.2-r0 apk
|
||||||
libcurl 8.9.0-r0 apk
|
libcurl 8.9.1-r2 apk
|
||||||
libdav1d 1.4.2-r0 apk
|
libdav1d 1.4.2-r0 apk
|
||||||
libedit 20240517.3.1-r0 apk
|
libedit 20240517.3.1-r0 apk
|
||||||
libevent 2.1.12-r7 apk
|
libevent 2.1.12-r7 apk
|
||||||
libexpat 2.6.2-r0 apk
|
libexpat 2.6.3-r0 apk
|
||||||
libffi 3.4.6-r0 apk
|
libffi 3.4.6-r0 apk
|
||||||
libgcc 13.2.1_git20240309-r0 apk
|
libgcc 13.2.1_git20240309-r0 apk
|
||||||
libgcrypt 1.10.3-r0 apk
|
libgcrypt 1.10.3-r0 apk
|
||||||
@@ -167,16 +168,16 @@ libip4tc 1.8.10-r3 apk
|
|||||||
libip6tc 1.8.10-r3 apk
|
libip6tc 1.8.10-r3 apk
|
||||||
libjpeg-turbo 3.0.3-r0 apk
|
libjpeg-turbo 3.0.3-r0 apk
|
||||||
libksba 1.6.6-r0 apk
|
libksba 1.6.6-r0 apk
|
||||||
libldap 2.6.7-r0 apk
|
libldap 2.6.8-r0 apk
|
||||||
libmaxminddb-libs 1.9.1-r0 apk
|
libmaxminddb-libs 1.9.1-r0 apk
|
||||||
libmcrypt 2.5.8-r10 apk
|
libmcrypt 2.5.8-r10 apk
|
||||||
libmd 1.1.0-r0 apk
|
libmd 1.1.0-r0 apk
|
||||||
libmemcached-libs 1.1.4-r1 apk
|
libmemcached-libs 1.1.4-r1 apk
|
||||||
libmnl 1.0.5-r2 apk
|
libmnl 1.0.5-r2 apk
|
||||||
libncursesw 6.4_p20240420-r0 apk
|
libncursesw 6.4_p20240420-r1 apk
|
||||||
libnftnl 1.2.6-r0 apk
|
libnftnl 1.2.6-r0 apk
|
||||||
libpanelw 6.4_p20240420-r0 apk
|
libpanelw 6.4_p20240420-r1 apk
|
||||||
libpng 1.6.43-r0 apk
|
libpng 1.6.44-r0 apk
|
||||||
libpq 16.3-r0 apk
|
libpq 16.3-r0 apk
|
||||||
libproc2 4.0.4-r0 apk
|
libproc2 4.0.4-r0 apk
|
||||||
libpsl 0.21.5-r1 apk
|
libpsl 0.21.5-r1 apk
|
||||||
@@ -185,7 +186,7 @@ libseccomp 2.5.5-r1 apk
|
|||||||
libsharpyuv 1.3.2-r0 apk
|
libsharpyuv 1.3.2-r0 apk
|
||||||
libsm 1.2.4-r4 apk
|
libsm 1.2.4-r4 apk
|
||||||
libsodium 1.0.19-r0 apk
|
libsodium 1.0.19-r0 apk
|
||||||
libssl3 3.3.1-r3 apk
|
libssl3 3.3.2-r0 apk
|
||||||
libstdc++ 13.2.1_git20240309-r0 apk
|
libstdc++ 13.2.1_git20240309-r0 apk
|
||||||
libtasn1 4.19.0-r2 apk
|
libtasn1 4.19.0-r2 apk
|
||||||
libunistring 1.2-r0 apk
|
libunistring 1.2-r0 apk
|
||||||
@@ -211,13 +212,13 @@ memcached 1.6.27-r0 apk
|
|||||||
mock 5.1.0 python
|
mock 5.1.0 python
|
||||||
more-itertools 10.3.0 python
|
more-itertools 10.3.0 python
|
||||||
mpdecimal 4.0.0-r0 apk
|
mpdecimal 4.0.0-r0 apk
|
||||||
msal 1.30.0 python
|
msal 1.31.0 python
|
||||||
msal-extensions 1.2.0 python
|
msal-extensions 1.2.0 python
|
||||||
musl 1.2.5-r0 apk
|
musl 1.2.5-r0 apk
|
||||||
musl-utils 1.2.5-r0 apk
|
musl-utils 1.2.5-r0 apk
|
||||||
my-test-package 1.0 python
|
my-test-package 1.0 python
|
||||||
nano 8.0-r0 apk
|
nano 8.0-r0 apk
|
||||||
ncurses-terminfo-base 6.4_p20240420-r0 apk
|
ncurses-terminfo-base 6.4_p20240420-r1 apk
|
||||||
netcat-openbsd 1.226-r0 apk
|
netcat-openbsd 1.226-r0 apk
|
||||||
nettle 3.9.1-r0 apk
|
nettle 3.9.1-r0 apk
|
||||||
nghttp2-libs 1.62.1-r0 apk
|
nghttp2-libs 1.62.1-r0 apk
|
||||||
@@ -242,7 +243,7 @@ nginx-mod-stream-geoip2 1.26.2-r0 apk
|
|||||||
nginx-vim 1.26.2-r0 apk
|
nginx-vim 1.26.2-r0 apk
|
||||||
npth 1.6-r4 apk
|
npth 1.6-r4 apk
|
||||||
oniguruma 6.9.9-r0 apk
|
oniguruma 6.9.9-r0 apk
|
||||||
openssl 3.3.1-r3 apk
|
openssl 3.3.2-r0 apk
|
||||||
p11-kit 0.25.3-r0 apk
|
p11-kit 0.25.3-r0 apk
|
||||||
packaging 24.1 python
|
packaging 24.1 python
|
||||||
parsedatetime 2.6 python
|
parsedatetime 2.6 python
|
||||||
@@ -251,55 +252,55 @@ pcre2 10.43-r0 apk
|
|||||||
perl 5.38.2-r0 apk
|
perl 5.38.2-r0 apk
|
||||||
perl-error 0.17029-r2 apk
|
perl-error 0.17029-r2 apk
|
||||||
perl-git 2.45.2-r0 apk
|
perl-git 2.45.2-r0 apk
|
||||||
php83 8.3.10-r0 apk
|
php83 8.3.12-r0 apk
|
||||||
php83-bcmath 8.3.10-r0 apk
|
php83-bcmath 8.3.12-r0 apk
|
||||||
php83-bz2 8.3.10-r0 apk
|
php83-bz2 8.3.12-r0 apk
|
||||||
php83-common 8.3.10-r0 apk
|
php83-common 8.3.12-r0 apk
|
||||||
php83-ctype 8.3.10-r0 apk
|
php83-ctype 8.3.12-r0 apk
|
||||||
php83-curl 8.3.10-r0 apk
|
php83-curl 8.3.12-r0 apk
|
||||||
php83-dom 8.3.10-r0 apk
|
php83-dom 8.3.12-r0 apk
|
||||||
php83-exif 8.3.10-r0 apk
|
php83-exif 8.3.12-r0 apk
|
||||||
php83-fileinfo 8.3.10-r0 apk
|
php83-fileinfo 8.3.12-r0 apk
|
||||||
php83-fpm 8.3.10-r0 apk
|
php83-fpm 8.3.12-r0 apk
|
||||||
php83-ftp 8.3.10-r0 apk
|
php83-ftp 8.3.12-r0 apk
|
||||||
php83-gd 8.3.10-r0 apk
|
php83-gd 8.3.12-r0 apk
|
||||||
php83-gmp 8.3.10-r0 apk
|
php83-gmp 8.3.12-r0 apk
|
||||||
php83-iconv 8.3.10-r0 apk
|
php83-iconv 8.3.12-r0 apk
|
||||||
php83-imap 8.3.10-r0 apk
|
php83-imap 8.3.12-r0 apk
|
||||||
php83-intl 8.3.10-r0 apk
|
php83-intl 8.3.12-r0 apk
|
||||||
php83-ldap 8.3.10-r0 apk
|
php83-ldap 8.3.12-r0 apk
|
||||||
php83-mbstring 8.3.10-r0 apk
|
php83-mbstring 8.3.12-r0 apk
|
||||||
php83-mysqli 8.3.10-r0 apk
|
php83-mysqli 8.3.12-r0 apk
|
||||||
php83-mysqlnd 8.3.10-r0 apk
|
php83-mysqlnd 8.3.12-r0 apk
|
||||||
php83-opcache 8.3.10-r0 apk
|
php83-opcache 8.3.12-r0 apk
|
||||||
php83-openssl 8.3.10-r0 apk
|
php83-openssl 8.3.12-r0 apk
|
||||||
php83-pdo 8.3.10-r0 apk
|
php83-pdo 8.3.12-r0 apk
|
||||||
php83-pdo_mysql 8.3.10-r0 apk
|
php83-pdo_mysql 8.3.12-r0 apk
|
||||||
php83-pdo_odbc 8.3.10-r0 apk
|
php83-pdo_odbc 8.3.12-r0 apk
|
||||||
php83-pdo_pgsql 8.3.10-r0 apk
|
php83-pdo_pgsql 8.3.12-r0 apk
|
||||||
php83-pdo_sqlite 8.3.10-r0 apk
|
php83-pdo_sqlite 8.3.12-r0 apk
|
||||||
php83-pear 8.3.10-r0 apk
|
php83-pear 8.3.12-r0 apk
|
||||||
php83-pecl-apcu 5.1.23-r0 apk
|
php83-pecl-apcu 5.1.23-r0 apk
|
||||||
php83-pecl-igbinary 3.2.15-r0 apk
|
php83-pecl-igbinary 3.2.15-r0 apk
|
||||||
php83-pecl-mcrypt 1.0.7-r0 apk
|
php83-pecl-mcrypt 1.0.7-r0 apk
|
||||||
php83-pecl-memcached 3.2.0-r0 apk
|
php83-pecl-memcached 3.2.0-r0 apk
|
||||||
php83-pecl-msgpack 2.2.0-r2 apk
|
php83-pecl-msgpack 2.2.0-r2 apk
|
||||||
php83-pecl-redis 6.0.2-r0 apk
|
php83-pecl-redis 6.1.0-r0 apk
|
||||||
php83-pgsql 8.3.10-r0 apk
|
php83-pgsql 8.3.12-r0 apk
|
||||||
php83-phar 8.3.10-r0 apk
|
php83-phar 8.3.12-r0 apk
|
||||||
php83-posix 8.3.10-r0 apk
|
php83-posix 8.3.12-r0 apk
|
||||||
php83-session 8.3.10-r0 apk
|
php83-session 8.3.12-r0 apk
|
||||||
php83-simplexml 8.3.10-r0 apk
|
php83-simplexml 8.3.12-r0 apk
|
||||||
php83-soap 8.3.10-r0 apk
|
php83-soap 8.3.12-r0 apk
|
||||||
php83-sockets 8.3.10-r0 apk
|
php83-sockets 8.3.12-r0 apk
|
||||||
php83-sodium 8.3.10-r0 apk
|
php83-sodium 8.3.12-r0 apk
|
||||||
php83-sqlite3 8.3.10-r0 apk
|
php83-sqlite3 8.3.12-r0 apk
|
||||||
php83-tokenizer 8.3.10-r0 apk
|
php83-tokenizer 8.3.12-r0 apk
|
||||||
php83-xml 8.3.10-r0 apk
|
php83-xml 8.3.12-r0 apk
|
||||||
php83-xmlreader 8.3.10-r0 apk
|
php83-xmlreader 8.3.12-r0 apk
|
||||||
php83-xmlwriter 8.3.10-r0 apk
|
php83-xmlwriter 8.3.12-r0 apk
|
||||||
php83-xsl 8.3.10-r0 apk
|
php83-xsl 8.3.12-r0 apk
|
||||||
php83-zip 8.3.10-r0 apk
|
php83-zip 8.3.12-r0 apk
|
||||||
pinentry 1.3.0-r0 apk
|
pinentry 1.3.0-r0 apk
|
||||||
pip 24.2 python
|
pip 24.2 python
|
||||||
pkb-client 1.2 python
|
pkb-client 1.2 python
|
||||||
@@ -308,11 +309,11 @@ popt 1.19-r3 apk
|
|||||||
portalocker 2.10.1 python
|
portalocker 2.10.1 python
|
||||||
procps-ng 4.0.4-r0 apk
|
procps-ng 4.0.4-r0 apk
|
||||||
proto-plus 1.24.0 python
|
proto-plus 1.24.0 python
|
||||||
protobuf 5.28.0 python
|
protobuf 5.28.2 python
|
||||||
pyacmedns 0.4 python
|
pyacmedns 0.4 python
|
||||||
pyasn1 0.6.0 python
|
pyasn1 0.6.1 python
|
||||||
pyasn1-modules 0.4.0 python
|
pyasn1-modules 0.4.1 python
|
||||||
pyc 3.12.3-r2 apk
|
pyc 3.12.6-r0 apk
|
||||||
pycparser 2.22 python
|
pycparser 2.22 python
|
||||||
pyjwt 2.9.0 python
|
pyjwt 2.9.0 python
|
||||||
pynamecheap 0.0.3 python
|
pynamecheap 0.0.3 python
|
||||||
@@ -323,10 +324,10 @@ pyrfc3339 1.1 python
|
|||||||
python-dateutil 2.9.0.post0 python
|
python-dateutil 2.9.0.post0 python
|
||||||
python-digitalocean 1.17.0 python
|
python-digitalocean 1.17.0 python
|
||||||
python-transip 0.6.0 python
|
python-transip 0.6.0 python
|
||||||
python3 3.12.3-r2 apk
|
python3 3.12.6-r0 apk
|
||||||
python3-pyc 3.12.3-r2 apk
|
python3-pyc 3.12.6-r0 apk
|
||||||
python3-pycache-pyc0 3.12.3-r2 apk
|
python3-pycache-pyc0 3.12.6-r0 apk
|
||||||
pytz 2024.1 python
|
pytz 2024.2 python
|
||||||
pyyaml 6.0.2 python
|
pyyaml 6.0.2 python
|
||||||
readline 8.2.10-r0 apk
|
readline 8.2.10-r0 apk
|
||||||
requests 2.32.3 python
|
requests 2.32.3 python
|
||||||
@@ -335,7 +336,7 @@ requests-mock 1.12.1 python
|
|||||||
rsa 4.9 python
|
rsa 4.9 python
|
||||||
s3transfer 0.10.2 python
|
s3transfer 0.10.2 python
|
||||||
scanelf 1.3.7-r2 apk
|
scanelf 1.3.7-r2 apk
|
||||||
setuptools 74.0.0 python
|
setuptools 75.1.0 python
|
||||||
shadow 4.15.1-r0 apk
|
shadow 4.15.1-r0 apk
|
||||||
six 1.16.0 python
|
six 1.16.0 python
|
||||||
skalibs 2.14.1.1-r0 apk
|
skalibs 2.14.1.1-r0 apk
|
||||||
@@ -347,10 +348,10 @@ tldextract 5.1.2 python
|
|||||||
tomli 2.0.1 python
|
tomli 2.0.1 python
|
||||||
typeguard 4.3.0 python
|
typeguard 4.3.0 python
|
||||||
typing-extensions 4.12.2 python (+1 duplicate)
|
typing-extensions 4.12.2 python (+1 duplicate)
|
||||||
tzdata 2024a-r1 apk
|
tzdata 2024b-r0 apk
|
||||||
unixodbc 2.3.12-r0 apk
|
unixodbc 2.3.12-r0 apk
|
||||||
uritemplate 4.1.1 python
|
uritemplate 4.1.1 python
|
||||||
urllib3 2.2.2 python
|
urllib3 2.2.3 python
|
||||||
utmps-libs 0.1.2.2-r1 apk
|
utmps-libs 0.1.2.2-r1 apk
|
||||||
wheel 0.43.0 python
|
wheel 0.43.0 python
|
||||||
wheel 0.44.0 python
|
wheel 0.44.0 python
|
||||||
|
|||||||
@@ -140,6 +140,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "30.08.24:", desc: "Fix zerossl cert revocation." }
|
||||||
- { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
|
- { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
|
||||||
- { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." }
|
- { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." }
|
||||||
- { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." }
|
- { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." }
|
||||||
|
|||||||
@@ -189,24 +189,15 @@ if [[ ! "${URL}" = "${ORIGURL}" ]] ||
|
|||||||
[[ ! "${STAGING}" = "${ORIGSTAGING}" ]] ||
|
[[ ! "${STAGING}" = "${ORIGSTAGING}" ]] ||
|
||||||
[[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
|
[[ ! "${CERTPROVIDER}" = "${ORIGCERTPROVIDER}" ]]; then
|
||||||
echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
|
echo "Different validation parameters entered than what was used before. Revoking and deleting existing certificate, and an updated one will be created"
|
||||||
if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]] && [[ -n "${ORIGEMAIL}" ]]; then
|
if [[ "${ORIGCERTPROVIDER}" = "zerossl" ]]; then
|
||||||
REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
|
REV_ACMESERVER=("https://acme.zerossl.com/v2/DV90")
|
||||||
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
|
|
||||||
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' "/config/etc/letsencrypt/renewal/${ORIGDOMAIN}.conf" | tr -d ' ')
|
|
||||||
if [[ -z "${REV_ZEROSSL_EAB_KID}" ]] || [[ -z "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
|
||||||
REV_ZEROSSL_EAB_KID=$(awk -F "=" '/eab-kid/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
|
|
||||||
REV_ZEROSSL_EAB_HMAC_KEY=$(awk -F "=" '/eab-hmac-key/ {print $2}' /config/etc/letsencrypt/cli.ini | tr -d ' ')
|
|
||||||
fi
|
|
||||||
if [[ -n "${REV_ZEROSSL_EAB_KID}" ]] && [[ -n "${REV_ZEROSSL_EAB_HMAC_KEY}" ]]; then
|
|
||||||
REV_ACMESERVER+=("--eab-kid" "${REV_ZEROSSL_EAB_KID}" "--eab-hmac-key" "${REV_ZEROSSL_EAB_HMAC_KEY}")
|
|
||||||
fi
|
|
||||||
elif [[ "${ORIGSTAGING}" = "true" ]]; then
|
elif [[ "${ORIGSTAGING}" = "true" ]]; then
|
||||||
REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory")
|
REV_ACMESERVER=("https://acme-staging-v02.api.letsencrypt.org/directory")
|
||||||
else
|
else
|
||||||
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
REV_ACMESERVER=("https://acme-v02.api.letsencrypt.org/directory")
|
||||||
fi
|
fi
|
||||||
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
if [[ -f /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem ]]; then
|
||||||
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --server "${REV_ACMESERVER[@]}" || true
|
certbot revoke --non-interactive --cert-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/fullchain.pem --key-path /config/etc/letsencrypt/live/"${ORIGDOMAIN}"/privkey.pem --server "${REV_ACMESERVER[@]}" || true
|
||||||
else
|
else
|
||||||
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
certbot revoke --non-interactive --cert-name "${ORIGDOMAIN}" --server "${REV_ACMESERVER[@]}" || true
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user