diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml index 6503ed0..9e61074 100755 --- a/.github/ISSUE_TEMPLATE/issue.bug.yml +++ b/.github/ISSUE_TEMPLATE/issue.bug.yml @@ -4,65 +4,15 @@ description: Create a report to help us improve title: "[BUG] " labels: [Bug] body: - - type: checkboxes + - type: markdown attributes: - label: Is there an existing issue for this? - description: Please search to see if an issue already exists for the bug you encountered. - options: - - label: I have searched the existing issues - required: true - - type: textarea - attributes: - label: Current Behavior - description: Tell us what happens instead of the expected behavior. - validations: - required: true - - type: textarea - attributes: - label: Expected Behavior - description: Tell us what should happen. - validations: - required: false - - type: textarea - attributes: - label: Steps To Reproduce - description: Steps to reproduce the behavior. - placeholder: | - 1. In this environment... - 2. With this config... - 3. Run '...' - 4. See error... - validations: - required: true - - type: textarea - attributes: - label: Environment - description: | - examples: - - **OS**: Ubuntu 20.04 - - **How docker service was installed**: distro's packagemanager value: | - - OS: - - How docker service was installed: - render: markdown - validations: - required: false - - type: textarea - attributes: - label: Docker creation - description: | - Command used to create docker container - Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container - render: bash - validations: - required: true - - type: textarea - attributes: - description: | - Provide a full docker log, output of "docker logs linuxserver.io" - label: Container logs - placeholder: | - Output of `docker logs linuxserver.io` - render: bash - validations: - required: true + # DEPRECATION NOTICE + + This image is deprecated. We will not offer support for this image and it will not be updated. + + Docker Compose is now available from the docker repos: + https://docs.docker.com/engine/install/ + + And also for direct download: + https://github.com/docker/compose diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml index 099dcdb..b0fef17 100755 --- a/.github/ISSUE_TEMPLATE/issue.feature.yml +++ b/.github/ISSUE_TEMPLATE/issue.feature.yml @@ -4,28 +4,15 @@ description: Suggest an idea for this project title: "[FEAT] <title>" labels: [enhancement] body: - - type: checkboxes + - type: markdown attributes: - label: Is this a new feature request? - description: Please search to see if a feature request already exists. - options: - - label: I have searched the existing issues - required: true - - type: textarea - attributes: - label: Wanted change - description: Tell us what you want to happen. - validations: - required: true - - type: textarea - attributes: - label: Reason for change - description: Justify your request, why do you want it, what is the benefit. - validations: - required: true - - type: textarea - attributes: - label: Proposed code change - description: Do you have a potential code change in mind? - validations: - required: false + value: | + # DEPRECATION NOTICE + + This image is deprecated. We will not offer support for this image and it will not be updated. + + Docker Compose is now available from the docker repos: + https://docs.docker.com/engine/install/ + + And also for direct download: + https://github.com/docker/compose diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 53a86c0..0a1774b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,3 +1,12 @@ +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +Docker Compose is now available from the docker repos: +https://docs.docker.com/engine/install/ + +And also for direct download: +https://github.com/docker/compose + <!--- Provide a general summary of your changes in the Title above --> [linuxserverurl]: https://linuxserver.io diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 126e983..899d7f4 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 relevant issue templates, or risk having this issue marked as invalid.' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-docker-compose/blob/v2/.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-docker-compose/blob/v2/README.md) may have additional information. Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' + 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-docker-compose/blob/v2/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-docker-compose/blob/v2/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index 3eefbba..28e98f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,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 .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/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/package_trigger.yml' + 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 ./root/etc/cont-init.d/99-deprecation' } script{ env.LS_RELEASE_NUMBER = sh( @@ -316,6 +316,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 @@ -323,6 +324,7 @@ pipeline { git add .gitignore fi git add ${TEMPLATED_FILES} + git rm ${TEMPDIR}/repo/${LS_REPO}/.github/workflows/{external_trigger,external_trigger_scheduler,package_trigger,package_trigger_scheduler}.yml || : git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} diff --git a/README.md b/README.md index 0be051f..9c710a1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,15 @@ <!-- DO NOT EDIT THIS FILE MANUALLY --> <!-- Please read the https://github.com/linuxserver/docker-docker-compose/blob/v2/.github/CONTRIBUTING.md --> +# DEPRECATION NOTICE + +This image is deprecated. We will not offer support for this image and it will not be updated. +Docker Compose is now available from the docker repos: +https://docs.docker.com/engine/install/ + +And also for direct download: +https://github.com/docker/compose + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") diff --git a/docker-compose-entrypoint.sh b/docker-compose-entrypoint.sh index d5b41e1..deed8c8 100755 --- a/docker-compose-entrypoint.sh +++ b/docker-compose-entrypoint.sh @@ -1,6 +1,25 @@ #!/bin/sh set -e +echo ' +┌────────────────────────────────────────────────────┐ +│ │ +│ │ +│ This image is deprecated. │ +│ We will not offer support for this image │ +│ and it will not be updated. │ +│ │ +│ │ +└────────────────────────────────────────────────────┘ + +Docker Compose is now available from the docker repos: +https://docs.docker.com/engine/install/ + +And also for direct download: +https://github.com/docker/compose + +──────────────────────────────────────────────────────' + set -- docker compose "$@" -exec "$@" \ No newline at end of file +exec "$@" diff --git a/readme-vars.yml b/readme-vars.yml index f6bcdb2..8b359ef 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -2,6 +2,15 @@ # project information project_name: docker-compose + +project_deprecation_status: true +project_deprecation_message: | + Docker Compose is now available from the docker repos: + https://docs.docker.com/engine/install/ + + And also for direct download: + https://github.com/docker/compose + full_custom_readme: | {% raw -%} [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) diff --git a/root/etc/cont-init.d/99-deprecation b/root/etc/cont-init.d/99-deprecation new file mode 100644 index 0000000..fb98f3e --- /dev/null +++ b/root/etc/cont-init.d/99-deprecation @@ -0,0 +1,24 @@ +#!/usr/bin/with-contenv bash + +echo ' +****************************************************** +****************************************************** +* * +* * +* This image is deprecated. * +* We will not offer support for this image * +* and it will not be updated. * +* * +* * +****************************************************** +****************************************************** + +Docker Compose is now available from the docker repos: +https://docs.docker.com/engine/install/ + +And also for direct download: +https://github.com/docker/compose + + +****************************************************** +******************************************************'