Skip to content
This repository was archived by the owner on May 25, 2024. It is now read-only.

Commit c708b51

Browse files
committed
Deprecate
1 parent 4d7ff62 commit c708b51

File tree

13 files changed

+100
-105
lines changed

13 files changed

+100
-105
lines changed

.github/ISSUE_TEMPLATE/issue.bug.yml

+6-68
Original file line numberDiff line numberDiff line change
@@ -4,73 +4,11 @@ description: Create a report to help us improve
44
title: "[BUG] <title>"
55
labels: [Bug]
66
body:
7-
- type: checkboxes
7+
- type: markdown
88
attributes:
9-
label: Is there an existing issue for this?
10-
description: Please search to see if an issue already exists for the bug you encountered.
11-
options:
12-
- label: I have searched the existing issues
13-
required: true
14-
- type: textarea
15-
attributes:
16-
label: Current Behavior
17-
description: Tell us what happens instead of the expected behavior.
18-
validations:
19-
required: true
20-
- type: textarea
21-
attributes:
22-
label: Expected Behavior
23-
description: Tell us what should happen.
24-
validations:
25-
required: false
26-
- type: textarea
27-
attributes:
28-
label: Steps To Reproduce
29-
description: Steps to reproduce the behavior.
30-
placeholder: |
31-
1. In this environment...
32-
2. With this config...
33-
3. Run '...'
34-
4. See error...
35-
validations:
36-
required: true
37-
- type: textarea
38-
attributes:
39-
label: Environment
40-
description: |
41-
examples:
42-
- **OS**: Ubuntu 20.04
43-
- **How docker service was installed**: distro's packagemanager
449
value: |
45-
- OS:
46-
- How docker service was installed:
47-
render: markdown
48-
validations:
49-
required: false
50-
- type: dropdown
51-
attributes:
52-
label: CPU architecture
53-
options:
54-
- x86-64
55-
- arm64
56-
validations:
57-
required: true
58-
- type: textarea
59-
attributes:
60-
label: Docker creation
61-
description: |
62-
Command used to create docker container
63-
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
64-
render: bash
65-
validations:
66-
required: true
67-
- type: textarea
68-
attributes:
69-
description: |
70-
Provide a full docker log, output of "docker logs endlessh"
71-
label: Container logs
72-
placeholder: |
73-
Output of `docker logs endlessh`
74-
render: bash
75-
validations:
76-
required: true
10+
# This image is deprecated. We will not offer support for this image and it will not be updated.
11+
12+
We recommend looking at an alternative implementation such as:
13+
https://github.com/shizunge/endlessh-go/
14+

.github/ISSUE_TEMPLATE/issue.feature.yml

+8-25
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,11 @@ description: Suggest an idea for this project
44
title: "[FEAT] <title>"
55
labels: [enhancement]
66
body:
7-
- type: checkboxes
8-
attributes:
9-
label: Is this a new feature request?
10-
description: Please search to see if a feature request already exists.
11-
options:
12-
- label: I have searched the existing issues
13-
required: true
14-
- type: textarea
15-
attributes:
16-
label: Wanted change
17-
description: Tell us what you want to happen.
18-
validations:
19-
required: true
20-
- type: textarea
21-
attributes:
22-
label: Reason for change
23-
description: Justify your request, why do you want it, what is the benefit.
24-
validations:
25-
required: true
26-
- type: textarea
27-
attributes:
28-
label: Proposed code change
29-
description: Do you have a potential code change in mind?
30-
validations:
31-
required: false
7+
- type: markdown
8+
attributes:
9+
value: |
10+
# This image is deprecated. We will not offer support for this image and it will not be updated.
11+
12+
We recommend looking at an alternative implementation such as:
13+
https://github.com/shizunge/endlessh-go/
14+

.github/PULL_REQUEST_TEMPLATE.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# This image is deprecated. We will not offer support for this image and it will not be updated.
2+
3+
We recommend looking at an alternative implementation such as:
4+
https://github.com/shizunge/endlessh-go/
5+
16
<!--- Provide a general summary of your changes in the Title above -->
27

38
[linuxserverurl]: https://linuxserver.io

.github/workflows/greetings.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
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.'
12-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-endlessh/blob/main/.github/PULL_REQUEST_TEMPLATE.md)!'
11+
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-endlessh/blob/main/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.'
12+
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-endlessh/blob/main/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-endlessh/blob/main/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

Jenkinsfile

+43-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pipeline {
6868
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
6969
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
7070
env.PULL_REQUEST = env.CHANGE_ID
71-
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'
71+
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/donate.txt ./root/etc/s6-overlay/s6-rc.d/init-deprecate/run ./root/etc/s6-overlay/s6-rc.d/init-deprecate/up ./root/etc/s6-overlay/s6-rc.d/init-deprecate/type ./root/etc/s6-overlay/s6-rc.d/init-deprecate/dependencies.d/init-config-end ./root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-deprecate ./root/etc/s6-overlay/s6-rc.d/user/contents.d/init-deprecate'
7272
}
7373
sh '''#! /bin/bash
7474
echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
@@ -306,6 +306,7 @@ pipeline {
306306
fi
307307
echo "Starting Stage 2 - Delete old templates"
308308
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 Dockerfile.armhf"
309+
OLD_TEMPLATES="${OLD_TEMPLATES} $(echo .github/workflows/{external_trigger,external_trigger_scheduler,package_trigger,package_trigger_scheduler,call_issue_pr_tracker,call_issues_cron}.yml)"
309310
for i in ${OLD_TEMPLATES}; do
310311
if [[ -f "${i}" ]]; then
311312
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -341,6 +342,10 @@ pipeline {
341342
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
342343
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
343344
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
345+
mkdir -p \
346+
${TEMPDIR}/repo/${LS_REPO}/root/etc/s6-overlay/s6-rc.d/init-deprecate/dependencies.d \
347+
${TEMPDIR}/repo/${LS_REPO}/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d \
348+
${TEMPDIR}/repo/${LS_REPO}/root/etc/s6-overlay/s6-rc.d/user/contents.d
344349
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
345350
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
346351
cd ${TEMPDIR}/repo/${LS_REPO}/
@@ -370,6 +375,19 @@ pipeline {
370375
git add docs/images/docker-${CONTAINER_NAME}.md
371376
echo "Updating docs repo"
372377
git commit -m 'Bot Updating Documentation'
378+
git mv docs/images/docker-${CONTAINER_NAME}.md docs/deprecated_images/docker-${CONTAINER_NAME}.md || :
379+
if ! command -v yq || ! yq --help | grep -q 'mikefarah'; then
380+
YQ_DL_VERSION=$(curl -fsX GET "https://api.github.com/repos/mikefarah/yq/releases/latest" | jq -r '. | .tag_name')
381+
echo "No yq found, retrieving from upstream release version ${YQ_DL_VERSION}"
382+
curl -fo /usr/local/bin/yq -L "https://github.com/mikefarah/yq/releases/download/${YQ_DL_VERSION}/yq_linux_amd64"
383+
chmod +x /usr/local/bin/yq
384+
fi
385+
if ! yq -e '.plugins.[].redirects.redirect_maps.[] | select(. == "deprecated/" + env(CONTAINER_NAME) + ".md")' mkdocs.yml >/dev/null 2>&1; then
386+
echo "Updating mkdocs.yml with deprecation info"
387+
yq -i '(.plugins.[] | select(.redirects)).redirects.redirect_maps |= . + {env(CONTAINER_NAME) + ".md" : "deprecated/" + env(CONTAINER_NAME) + ".md"}' mkdocs.yml
388+
git add mkdocs.yml
389+
fi
390+
git commit -m 'Bot Moving Deprecated Documentation' || :
373391
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
374392
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
375393
(MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
@@ -391,6 +409,10 @@ pipeline {
391409
echo "Updating Unraid template"
392410
cd ${TEMPDIR}/unraid/templates/
393411
GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
412+
if ! grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
413+
echo "${CONTAINER_NAME}" >> ${TEMPDIR}/unraid/templates/unraid/ignore.list
414+
git add unraid/ignore.list
415+
fi
394416
if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
395417
echo "Image is on the ignore list, marking Unraid template as deprecated"
396418
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
@@ -1002,6 +1024,26 @@ EOF
10021024

10031025
}
10041026
}
1027+
stage('Deprecate/Disable Future Builds') {
1028+
when {
1029+
branch "main"
1030+
environment name: 'CHANGE_ID', value: ''
1031+
environment name: 'EXIT_STATUS', value: ''
1032+
}
1033+
steps {
1034+
sh '''#! /bin/bash
1035+
TEMPDIR=$(mktemp -d)
1036+
mkdir -p ${TEMPDIR}/repo
1037+
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
1038+
cd ${TEMPDIR}/repo/${LS_REPO}
1039+
git checkout -f main
1040+
git rm Jenkinsfile
1041+
git commit -m 'Disabling future builds'
1042+
git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
1043+
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main
1044+
rm -Rf ${TEMPDIR}'''
1045+
}
1046+
}
10051047
}
10061048
/* ######################
10071049
Send status to Discord

README.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Find us at:
2626
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
2727
* [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
2828

29+
# This image is deprecated. We will not offer support for this image and it will not be updated.
30+
31+
We recommend looking at an alternative implementation such as:
32+
https://github.com/shizunge/endlessh-go/
33+
2934
# [linuxserver/endlessh](https://github.com/linuxserver/docker-endlessh)
3035

3136
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fendlessh?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fendlessh)
@@ -83,7 +88,7 @@ services:
8388
- LOGFILE=false #optional
8489
- BINDFAMILY= #optional
8590
volumes:
86-
- /path/to/appdata:/config #optional
91+
- /path/to/endlessh/appdata:/config #optional
8792
ports:
8893
- 22:2222
8994
restart: unless-stopped
@@ -103,7 +108,7 @@ docker run -d \
103108
-e LOGFILE=false `#optional` \
104109
-e BINDFAMILY= `#optional` \
105110
-p 22:2222 \
106-
-v /path/to/appdata:/config `#optional` \
111+
-v /path/to/endlessh/appdata:/config `#optional` \
107112
--restart unless-stopped \
108113
lscr.io/linuxserver/endlessh:latest
109114
```
@@ -286,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
286291

287292
## Versions
288293

294+
* **20.03.24:** - Deprecate image.
289295
* **12.06.23:** - Rebase to Alpine 3.18, deprecate armhf.
290296
* **05.03.23:** - Rebase to Alpine 3.17.
291297
* **23.09.22:** - Migrate to s6v3.

readme-vars.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxs
77
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is an SSH tarpit that very slowly sends an endless, random SSH banner. It keeps SSH clients locked up for hours or even days at a time. The purpose is to put your real SSH server on another port and then let the script kiddies get stuck in this tarpit instead of bothering a real server."
88
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
99

10+
project_deprecation_status: true
11+
project_deprecation_message: |
12+
We recommend looking at an alternative implementation such as:
13+
https://github.com/shizunge/endlessh-go/
14+
1015
# supported architectures
1116
available_architectures:
1217
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -18,15 +23,9 @@ development_versions: false
1823
# container parameters
1924
common_param_env_vars_enabled: true
2025
param_container_name: "{{ project_name }}"
21-
param_usage_include_vols: false
22-
param_volumes:
23-
- { vol_path: "/config", vol_host_path: "/path/to/appdata", desc: "Contains all relevant configuration and data." }
2426
param_usage_include_ports: true
2527
param_ports:
2628
- { external_port: "22", internal_port: "2222", port_desc: "ssh port" }
27-
param_usage_include_env: true
28-
param_env_vars:
29-
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
3029

3130
# optional container parameters
3231
opt_param_usage_include_env: true
@@ -38,7 +37,7 @@ opt_param_env_vars:
3837
- { env_var: "BINDFAMILY", env_value: "", desc: "By default, the app binds to IPv4 and IPv6 addresses. Set it to `4` or `6` to bind to IPv4 only or IPv6 only, respectively. Leave blank to bind to both." }
3938
opt_param_usage_include_vols: true
4039
opt_param_volumes:
41-
- { vol_path: "/config", vol_host_path: "/path/to/appdata", desc: "Required if `LOGFILE` is set to `true`." }
40+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/appdata", desc: "Required if `LOGFILE` is set to `true`." }
4241

4342
# application setup block
4443
app_setup_block_enabled: true
@@ -47,6 +46,7 @@ app_setup_block: |
4746
4847
# changelog
4948
changelogs:
49+
- { date: "20.03.24:", desc: "Deprecate image." }
5050
- { date: "12.06.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
5151
- { date: "05.03.23:", desc: "Rebase to Alpine 3.17." }
5252
- { date: "23.09.22:", desc: "Migrate to s6v3." }

root/etc/s6-overlay/s6-rc.d/init-deprecate/dependencies.d/init-config-end

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
3+
4+
echo '
5+
╔════════════════════════════════════════════════════╗
6+
╠════════════════════════════════════════════════════╣
7+
║ ║
8+
║ This image is deprecated. ║
9+
║ We will not offer support for this image ║
10+
║ and it will not be updated. ║
11+
║ ║
12+
╠════════════════════════════════════════════════════╣
13+
╚════════════════════════════════════════════════════╝
14+
15+
We recommend looking at an alternative implementation such as:
16+
https://github.com/shizunge/endlessh-go/
17+
18+
19+
══════════════════════════════════════════════════════'
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-deprecate/run

root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-deprecate

Whitespace-only changes.

root/etc/s6-overlay/s6-rc.d/user/contents.d/init-deprecate

Whitespace-only changes.

0 commit comments

Comments
 (0)