From 6cb038c3053c05ebd383bd12a7c642f5070ee01a Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 15 Jun 2021 10:15:27 -0400 Subject: [PATCH] deprecate --- .github/ISSUE_TEMPLATE/issue.bug.md | 6 ++++++ .github/ISSUE_TEMPLATE/issue.feature.md | 6 ++++++ .github/PULL_REQUEST_TEMPLATE.md | 6 ++++++ .github/workflows/greetings.yml | 4 ++-- Jenkinsfile | 7 ++++++- README.md | 9 ++++++++- readme-vars.yml | 8 +++++++- root/etc/cont-init.d/99-deprecation | 21 +++++++++++++++++++++ 8 files changed, 62 insertions(+), 5 deletions(-) create mode 100644 root/etc/cont-init.d/99-deprecation diff --git a/.github/ISSUE_TEMPLATE/issue.bug.md b/.github/ISSUE_TEMPLATE/issue.bug.md index 6eae7e1..b0514af 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.md +++ b/.github/ISSUE_TEMPLATE/issue.bug.md @@ -3,6 +3,12 @@ name: Bug report about: Create a report to help us improve --- +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +We recommend our wireguard image instead for vpn: +https://github.com/linuxserver/docker-wireguard + [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] diff --git a/.github/ISSUE_TEMPLATE/issue.feature.md b/.github/ISSUE_TEMPLATE/issue.feature.md index 20a91fd..65debf3 100755 --- a/.github/ISSUE_TEMPLATE/issue.feature.md +++ b/.github/ISSUE_TEMPLATE/issue.feature.md @@ -3,6 +3,12 @@ name: Feature request about: Suggest an idea for this project --- +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +We recommend our wireguard image instead for vpn: +https://github.com/linuxserver/docker-wireguard + [linuxserverurl]: https://linuxserver.io [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ea7d444..eec7c2d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,9 @@ +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +We recommend our wireguard image instead for vpn: +https://github.com/linuxserver/docker-wireguard + [linuxserverurl]: https://linuxserver.io diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 19b331e..4484472 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 [bug](https://github.com/linuxserver/docker-openvpn-as/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-openvpn-as/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-openvpn-as/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' + issue-message: 'This image is deprecated. We will not offer support for this image and it will not be updated. The [README](https://github.com/linuxserver/docker-openvpn-as/blob/master/README.md) may have additional information. Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-openvpn-as/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-openvpn-as/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!' + pr-message: 'This image is deprecated. We will not offer support for this image and it will not be updated. The [README](https://github.com/linuxserver/docker-openvpn-as/blob/master/README.md) may have additional information. Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-openvpn-as/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index 306ac3e..a4549e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -55,7 +55,7 @@ pipeline { 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.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/etc/cont-init.d/99-deprecation' } script{ env.LS_RELEASE_NUMBER = sh( @@ -285,6 +285,7 @@ pipeline { cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE + mkdir -p ${TEMPDIR}/repo/${LS_REPO}/root/etc/cont-init.d cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : cd ${TEMPDIR}/repo/${LS_REPO}/ if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then @@ -315,6 +316,10 @@ pipeline { 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}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ + if ! grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then + echo "${CONTAINER_NAME}" >> ${TEMPDIR}/unraid/templates/unraid/ignore.list + git add unraid/templates/unraid/ignore.list + fi if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then echo "Image is on the ignore list, removing Unraid template" git rm unraid/${CONTAINER_NAME}.xml || : diff --git a/README.md b/README.md index 8b16038..4a7403d 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,12 @@ Find us at: * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +We recommend our wireguard image instead for vpn: +https://github.com/linuxserver/docker-wireguard + # [linuxserver/openvpn-as](https://github.com/linuxserver/docker-openvpn-as) [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-openvpn-as.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-openvpn-as) @@ -61,7 +67,7 @@ This image provides various versions that are available via tags. `latest` tag u | Tag | Description | | :----: | --- | -| latest | Stable releases based on ubuntu bionic | +| latest | DEPRECATED, no longer updated - Stable releases based on ubuntu bionic | | xenial | DEPRECATED, no longer updated - Stable releases based on ubuntu xenial | ## Application Setup @@ -252,6 +258,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **15.06.20:** - Deprecate. * **15.06.20:** - Add fixes for 2.9.0. * **04.11.20:** - `xenial` tag is deprecated and there will be no further releases for that tag. * **22.06.20:** - Added Support for persistent Customization Folders. diff --git a/readme-vars.yml b/readme-vars.yml index b469fc8..0489a2a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -8,6 +8,11 @@ project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a full fea project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false +project_deprecation_status: true +project_deprecation_message: | + We recommend our wireguard image instead for vpn: + https://github.com/linuxserver/docker-wireguard + # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "latest"} @@ -15,7 +20,7 @@ available_architectures: # development version development_versions: true development_versions_items: - - { tag: "latest", desc: "Stable releases based on ubuntu bionic" } + - { tag: "latest", desc: "DEPRECATED, no longer updated - Stable releases based on ubuntu bionic" } - { tag: "xenial", desc: "DEPRECATED, no longer updated - Stable releases based on ubuntu xenial" } # container parameters @@ -66,6 +71,7 @@ app_setup_block: | # changelog changelogs: + - { date: "15.06.20:", desc: "Deprecate." } - { date: "15.06.20:", desc: "Add fixes for 2.9.0." } - { date: "04.11.20:", desc: "`xenial` tag is deprecated and there will be no further releases for that tag." } - { date: "22.06.20:", desc: "Added Support for persistent Customization Folders." } diff --git a/root/etc/cont-init.d/99-deprecation b/root/etc/cont-init.d/99-deprecation new file mode 100644 index 0000000..cc3c9d7 --- /dev/null +++ b/root/etc/cont-init.d/99-deprecation @@ -0,0 +1,21 @@ +#!/usr/bin/with-contenv bash + +echo ' +****************************************************** +****************************************************** +* * +* * +* This image is deprecated. * +* We will not offer support for this image * +* and it will not be updated. * +* * +* * +****************************************************** +****************************************************** + +We recommend our wireguard image instead for vpn: +https://github.com/linuxserver/docker-wireguard + + +****************************************************** +******************************************************'