From 23c1edb8f68792c60b6bf4a22daaf29f7f27a19c Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 12 Jan 2021 11:20:49 -0500 Subject: [PATCH] deprecate lts tag --- .github/workflows/external_trigger.yml | 3 ++- .github/workflows/greetings.yml | 2 +- .../workflows/package_trigger_scheduler.yml | 2 +- Jenkinsfile | 19 ++++++++++++++++++- README.md | 9 +++++---- readme-vars.yml | 9 +++++---- 6 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3e3d985c..6d74664a 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -22,8 +22,9 @@ jobs: if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for unifi-controller branch master" + GHA_TRIGGER_URL="https://github.com/linuxserver/docker-unifi-controller/actions/runs/${{ github.run_id }}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, - "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 8fdfb248..aa77380fb 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -8,6 +8,6 @@ jobs: steps: - uses: actions/first-interaction@v1 with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/ISSUE_TEMPLATE.md)!' + issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index e26b9caa..6f306054 100755 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '52 9 * * 4' + - cron: '50 3 * * 2' workflow_dispatch: jobs: diff --git a/Jenkinsfile b/Jenkinsfile index 020d9dbc..63139fc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,13 +255,30 @@ pipeline { fi mkdir -p ${TEMPDIR}/gitbook git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation - if [[ "${BRANCH_NAME}" == "master" ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/ cd ${TEMPDIR}/gitbook/docker-documentation/ git add images/docker-${CONTAINER_NAME}.md git commit -m 'Bot Updating Documentation' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all fi + mkdir -p ${TEMPDIR}/unraid + git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then + sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml + fi + if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then + if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "Image is on the ignore list, skipping Unraid template upload" + else + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + cd ${TEMPDIR}/unraid/templates/ + git add unraid/${CONTAINER_NAME}.xml + git commit -m 'Bot Updating Unraid Template' + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all + fi + fi rm -Rf ${TEMPDIR}''' script{ env.FILES_UPDATED = sh( diff --git a/README.md b/README.md index bf2ab080..b6927720 100644 --- a/README.md +++ b/README.md @@ -121,10 +121,10 @@ This image provides various versions that are available via tags. `latest` tag p | Tag | Description | | :----: | -------------------------------------------- | | latest | releases from the latest stable branch. | -| LTS | releases from the 5.6.x "LTS Stable" branch. | -| 5.9 | releases from the now EOL 5.9.x branch. | -| 5.8 | releases from the now EOL 5.8.x branch. | -| 5.7 | releases from the now EOL 5.7.x branch. | +| LTS | DEPRECATED - releases from the now EOL 5.6.x "LTS Stable" branch. | +| 5.9 | DEPRECATED - releases from the now EOL 5.9.x branch. | +| 5.8 | DEPRECATED - releases from the now EOL 5.8.x branch. | +| 5.7 | DEPRECATED - releases from the now EOL 5.7.x branch. | ## Common problems When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address. @@ -269,6 +269,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.01.21:** - Deprecate the `LTS` tag as Unifi no longer releases LTS stable builds. Existing users can switch to the `latest` tag. Direct upgrade from 5.6.42 (LTS) to 6.0.42 (latest) tested successfully. * **17.07.20:** - Rebase 64 bit containers to Bionic and Mongo 3.6. * **16.06.20:** - Add logrotate. * **02.06.20:** - Updated port list & descriptions. Moved some ports to optional. diff --git a/readme-vars.yml b/readme-vars.yml index 4f73ecdc..4d142480 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -30,10 +30,10 @@ optional_block_1_items: | Tag | Description | | :----: | -------------------------------------------- | | latest | releases from the latest stable branch. | - | LTS | releases from the 5.6.x "LTS Stable" branch. | - | 5.9 | releases from the now EOL 5.9.x branch. | - | 5.8 | releases from the now EOL 5.8.x branch. | - | 5.7 | releases from the now EOL 5.7.x branch. | + | LTS | DEPRECATED - releases from the now EOL 5.6.x "LTS Stable" branch. | + | 5.9 | DEPRECATED - releases from the now EOL 5.9.x branch. | + | 5.8 | DEPRECATED - releases from the now EOL 5.8.x branch. | + | 5.7 | DEPRECATED - releases from the now EOL 5.7.x branch. | ## Common problems When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address. @@ -78,6 +78,7 @@ app_setup_block: | # changelog changelogs: + - { date: "12.01.21:", desc: "Deprecate the `LTS` tag as Unifi no longer releases LTS stable builds. Existing users can switch to the `latest` tag. Direct upgrade from 5.6.42 (LTS) to 6.0.42 (latest) tested successfully."} - { date: "17.07.20:", desc: "Rebase 64 bit containers to Bionic and Mongo 3.6."} - { date: "16.06.20:", desc: "Add logrotate."} - { date: "02.06.20:", desc: "Updated port list & descriptions. Moved some ports to optional."}