Skip to content

Commit 94aba28

Browse files
committed
git commit -m "Bot Updating Templated Files
- Update GitHub templates and workflows - Update Jenkinsfile with fixes: * Remove tab character from credentials ID * Add LSIO_FIRST_PARTY check before adding * Remove unnecessary wait command - Update S6 service scripts and permissions - Update readme-vars.yml with proper project_name variable - Sync Dockerfiles with latest baseimage changes Co-authored-by: Jenkins CI <ci@linuxserver.io>"
1 parent 8e1bcd5 commit 94aba28

29 files changed

Lines changed: 541 additions & 464 deletions

.dockerignore

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
.git
2-
.gitignore
32
.github
3+
.gitignore
44
.gitattributes
5-
READMETEMPLATE.md
5+
66
README.md
7+
READMETEMPLATE.md
8+
9+
# build junk
10+
**/*.md~
11+
**/*.swp
12+
**/.DS_Store

.github/CONTRIBUTING.md

Lines changed: 55 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,91 @@
1-
# Contributing to lidarr
1+
# Contributing to docker-lidarr
22

3-
## Gotchas
3+
Thank you for taking the time to contribute to this project.
4+
We appreciate all contributions, but please follow the guidelines below to ensure a smooth review process and CI pipeline execution.
45

5-
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
6-
* Read, and fill the Pull Request template
7-
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
8-
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
9-
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
6+
---
107

11-
## Common files
8+
## Important guidelines (read first)
129

13-
| File | Use case |
14-
| :----: | --- |
15-
| `Dockerfile` | Dockerfile used to build amd64 images |
16-
| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
17-
| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
18-
| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
19-
| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
20-
| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
21-
| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
22-
| `readme-vars.yml` | This file is used to generate the `README.md` |
10+
- Make sure all changes are completed before opening a Pull Request.
11+
Our CI pipeline builds every commit after the PR is opened.
2312

24-
## Readme
13+
- Always fill out the Pull Request template completely.
2514

26-
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-lidarr/edit/master/readme-vars.yml).
15+
- Do NOT open PRs for simple typos in documentation, code, or README.
16+
Instead, open an issue and we will handle it.
2817

29-
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
30-
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-lidarr)
18+
- If your PR fixes an existing issue, include:
19+
`closes #<issue number>` in the PR description or commit message.
3120

32-
### Fixing typos or clarify the text in the readme
21+
- For discussions and help:
22+
- Discord server: https://linuxserver.io/discord
23+
- Dev chat: https://discordapp.com/channels/354974912613449730/757585807061155840
3324

34-
There are variables for multiple parts of the readme, the most common ones are:
25+
---
3526

36-
| Variable | Description |
37-
| :----: | --- |
38-
| `project_blurb` | This is the short excerpt shown above the project logo. |
39-
| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
27+
## Repository structure overview
28+
29+
| File | Purpose |
30+
|------|--------|
31+
| `Dockerfile` | AMD64 build definition |
32+
| `Dockerfile.aarch64` | ARM64 build definition |
33+
| `Dockerfile.armhf` | ARM32 build definition |
34+
| `Jenkinsfile` | Auto-generated CI pipeline (DO NOT EDIT) |
35+
| `jenkins-vars.yml` | Build configuration for Jenkins |
36+
| `package_versions.txt` | Generated package inventory |
37+
| `README.md` | Auto-generated documentation (DO NOT EDIT) |
38+
| `readme-vars.yml` | Source file for README generation |
4039

41-
### Parameters
40+
---
4241

43-
The compose and run examples are also generated from these variables.
42+
## README changes
4443

45-
We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
44+
⚠️ DO NOT edit `README.md` directly.
4645

47-
These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
48-
Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
46+
All README changes must be made in:
4947

50-
Devices, environment variables, ports and volumes expects its variables in a certain way.
48+
https://github.com/linuxserver/docker-lidarr/edit/master/readme-vars.yml
5149

52-
### Devices
50+
This file is used by the Jenkins build system and documentation generator:
5351

54-
```yml
55-
param_devices:
56-
- { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
57-
opt_param_devices:
58-
- { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
59-
```
52+
https://docs.linuxserver.io/images/docker-lidarr
6053

61-
### Environment variables
54+
---
6255

63-
```yml
64-
param_env_vars:
65-
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
66-
opt_param_env_vars:
67-
- { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
68-
```
56+
### Common README variables
6957

70-
### Ports
58+
| Variable | Description |
59+
|----------|-------------|
60+
| `project_blurb` | Short description shown under the project logo |
61+
| `app_setup_block` | Application setup instructions section |
7162

72-
```yml
73-
param_ports:
74-
- { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
75-
opt_param_ports:
76-
- { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
77-
```
63+
---
7864

79-
### Volumes
65+
## Container parameters system
8066

81-
```yml
82-
param_volumes:
83-
- { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
84-
opt_param_volumes:
85-
- { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
86-
```
67+
All Docker run / compose examples are generated automatically.
8768

88-
### Testing template changes
69+
Reference variables:
70+
https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank
8971

90-
After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
72+
---
9173

9274
## Dockerfiles
9375

94-
We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
95-
If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
76+
We use multiple Dockerfiles because different CPU architectures require different packages.
77+
78+
If you modify dependencies, ensure changes are applied consistently across all Dockerfiles in alphabetical order.
9679

97-
### Testing your changes
80+
---
81+
82+
### Testing your changes locally
9883

9984
```bash
10085
git clone https://github.com/linuxserver/docker-lidarr.git
10186
cd docker-lidarr
87+
10288
docker build \
10389
--no-cache \
10490
--pull \
105-
-t linuxserver/lidarr:latest .
106-
```
107-
108-
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
109-
110-
```bash
111-
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
112-
```
113-
114-
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
115-
116-
## Update the changelog
117-
118-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-lidarr/tree/master/root), add an entry to the changelog
119-
120-
```yml
121-
changelogs:
122-
- { date: "DD.MM.YY:", desc: "Added some love to templates" }
123-
```
91+
-t linuxserver/lidarr:latest .

.github/FUNDING.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
github: linuxserver
22
open_collective: linuxserver
3-
custom: ["https://opencollective.com/lidarr",]
3+
custom:
4+
- https://opencollective.com/lidarr

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
blank_issues_enabled: false
2+
23
contact_links:
34
- name: Discord chat support
45
url: https://linuxserver.io/discord
@@ -10,4 +11,4 @@ contact_links:
1011

1112
- name: Documentation
1213
url: https://docs.linuxserver.io/images/docker-lidarr
13-
about: Documentation - information about all of our containers.
14+
about: Documentation and container information.
Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,79 @@
1-
# Based on the issue template
21
name: Bug report
3-
description: Create a report to help us improve
4-
title: "[BUG] <title>"
5-
labels: [Bug]
2+
description: Create a report to help improve the container
3+
title: "[BUG] "
4+
labels:
5+
- bug
6+
67
body:
78
- type: checkboxes
89
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.
10+
label: Existing issue check
11+
description: Search existing issues before creating a new one.
1112
options:
12-
- label: I have searched the existing issues
13+
- label: I searched existing issues
1314
required: true
15+
16+
- type: input
17+
attributes:
18+
label: Container version
19+
placeholder: lscr.io/linuxserver/lidarr:latest
20+
validations:
21+
required: true
22+
1423
- type: textarea
1524
attributes:
16-
label: Current Behavior
17-
description: Tell us what happens instead of the expected behavior.
25+
label: Current behavior
26+
description: What is happening?
1827
validations:
1928
required: true
29+
2030
- type: textarea
2131
attributes:
22-
label: Expected Behavior
23-
description: Tell us what should happen.
32+
label: Expected behavior
33+
description: What should happen?
2434
validations:
25-
required: false
35+
required: true
36+
2637
- type: textarea
2738
attributes:
28-
label: Steps To Reproduce
29-
description: Steps to reproduce the behavior.
39+
label: Steps to reproduce
3040
placeholder: |
31-
1. In this environment...
32-
2. With this config...
33-
3. Run '...'
34-
4. See error...
41+
1. Deploy container
42+
2. Open web UI
43+
3. Trigger action
44+
4. Observe error
3545
validations:
3646
required: true
47+
3748
- type: textarea
3849
attributes:
3950
label: Environment
40-
description: |
41-
examples:
42-
- **OS**: Ubuntu 20.04
43-
- **How docker service was installed**: distro's packagemanager
4451
value: |
4552
- OS:
46-
- How docker service was installed:
47-
render: markdown
53+
- Docker version:
54+
- Docker compose version:
4855
validations:
49-
required: false
56+
required: true
57+
5058
- type: dropdown
5159
attributes:
5260
label: CPU architecture
5361
options:
54-
- x86-64
62+
- x86_64
5563
- arm64
5664
validations:
5765
required: true
66+
5867
- type: textarea
5968
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
69+
label: Docker compose
70+
render: yaml
6571
validations:
6672
required: true
73+
6774
- type: textarea
6875
attributes:
69-
description: |
70-
Provide a full docker log, output of "docker logs lidarr"
7176
label: Container logs
72-
placeholder: |
73-
Output of `docker logs lidarr`
7477
render: bash
7578
validations:
76-
required: true
79+
required: true
Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,29 @@
1-
# Based on the issue template
21
name: Feature request
3-
description: Suggest an idea for this project
4-
title: "[FEAT] <title>"
5-
labels: [enhancement]
2+
description: Suggest a new feature or improvement
3+
title: "[FEAT] "
4+
labels:
5+
- enhancement
6+
67
body:
78
- type: checkboxes
89
attributes:
9-
label: Is this a new feature request?
10-
description: Please search to see if a feature request already exists.
10+
label: Existing feature request check
1111
options:
12-
- label: I have searched the existing issues
12+
- label: I searched existing feature requests
1313
required: true
14+
1415
- type: textarea
1516
attributes:
16-
label: Wanted change
17-
description: Tell us what you want to happen.
17+
label: Requested change
1818
validations:
1919
required: true
20+
2021
- type: textarea
2122
attributes:
22-
label: Reason for change
23-
description: Justify your request, why do you want it, what is the benefit.
23+
label: Why is this useful?
2424
validations:
2525
required: true
26+
2627
- type: textarea
2728
attributes:
28-
label: Proposed code change
29-
description: Do you have a potential code change in mind?
30-
validations:
31-
required: false
29+
label: Proposed implementation

0 commit comments

Comments
 (0)