Skip to content
This repository has been archived by the owner on Jun 15, 2021. It is now read-only.

Commit

Permalink
Merge pull request #149 from linuxserver/deprecate
Browse files Browse the repository at this point in the history
deprecate
  • Loading branch information
aptalca authored Jun 15, 2021
2 parents e661227 + 6cb038c commit c0f40ea
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
6 changes: 6 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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

<!--- Provide a general summary of your changes in the Title above -->

[linuxserverurl]: https://linuxserver.io
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
7 changes: 6 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 || :
Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
8 changes: 7 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@ 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"}

# 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
Expand Down Expand Up @@ -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." }
Expand Down
21 changes: 21 additions & 0 deletions root/etc/cont-init.d/99-deprecation
Original file line number Diff line number Diff line change
@@ -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


******************************************************
******************************************************'

0 comments on commit c0f40ea

Please sign in to comment.