Skip to content

Commit 3d02d09

Browse files
thespadthespad
authored
Merge branch 'master' into db-check
2 parents 351bb78 + 240d123 commit 3d02d09

16 files changed

+232
-140
lines changed

‎.github/ISSUE_TEMPLATE/issue.bug.md

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/issue.bug.yml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Based on the issue template
2+
name: Bug report
3+
description: Create a report to help us improve
4+
title: "[BUG] <title>"
5+
labels: [Bug]
6+
body:
7+
- type: checkboxes
8+
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
44+
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+
- armhf
57+
validations:
58+
required: true
59+
- type: textarea
60+
attributes:
61+
label: Docker creation
62+
description: |
63+
Command used to create docker container
64+
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
65+
render: bash
66+
validations:
67+
required: true
68+
- type: textarea
69+
attributes:
70+
description: |
71+
Provide a full docker log, output of "docker logs linuxserver.io"
72+
label: Container logs
73+
placeholder: |
74+
Output of `docker logs linuxserver.io`
75+
render: bash
76+
validations:
77+
required: true

‎.github/ISSUE_TEMPLATE/issue.feature.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/issue.feature.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Based on the issue template
2+
name: Feature request
3+
description: Suggest an idea for this project
4+
title: "[FEAT] <title>"
5+
labels: [enhancement]
6+
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

‎.github/workflows/call_invalid_helper.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Comment on invalid interaction
2+
on:
3+
issues:
4+
types:
5+
- labeled
6+
jobs:
7+
add-comment-on-invalid:
8+
if: github.event.label.name == 'invalid'
9+
permissions:
10+
issues: write
11+
uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
12+
secrets: inherit

‎.github/workflows/external_trigger.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
external-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2.3.3
10+
- uses: actions/checkout@v3.1.0
1111

1212
- name: External Trigger
1313
if: github.ref == 'refs/heads/master'
@@ -48,8 +48,12 @@ jobs:
4848
| jq -r '.config.digest')
4949
image_info=$(curl -sL \
5050
--header "Authorization: Bearer ${token}" \
51-
"https://ghcr.io/v2/${image}/blobs/${digest}" \
52-
| jq -r '.container_config')
51+
"https://ghcr.io/v2/${image}/blobs/${digest}")
52+
if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
53+
image_info=$(echo $image_info | jq -r '.config')
54+
else
55+
image_info=$(echo $image_info | jq -r '.container_config')
56+
fi
5357
IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
5458
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
5559
if [ -z "${IMAGE_VERSION}" ]; then

‎.github/workflows/external_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
external-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2.3.3
12+
- uses: actions/checkout@v3.1.0
1313
with:
1414
fetch-depth: '0'
1515

‎.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
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 [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-bookstack/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-bookstack/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/package_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
package-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2.3.3
10+
- uses: actions/checkout@v3.1.0
1111

1212
- name: Package Trigger
1313
if: github.ref == 'refs/heads/master'

‎.github/workflows/package_trigger_scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
package-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2.3.3
12+
- uses: actions/checkout@v3.1.0
1313
with:
1414
fetch-depth: '0'
1515

0 commit comments

Comments
 (0)