Skip to content

Commit 9c66cc4

Browse files
tobiasgetobiasge
authored
Merge pull request #606 from netbox-community/develop
Version 1.4.1
2 parents 6a52a48 + 68401ca commit 9c66cc4

File tree

12 files changed

+277
-175
lines changed

12 files changed

+277
-175
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

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

‎.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
name: Bug report
2+
description: Create a report about a malfunction of the Docker setup
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
Please only raise an issue if you're certain that you've found a bug.
8+
Else, see these other means to get help:
9+
10+
- See our troubleshooting section:
11+
https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
12+
- Have a look at the rest of the wiki:
13+
https://github.com/netbox-community/netbox-docker/wiki
14+
- Check the release notes:
15+
https://github.com/netbox-community/netbox-docker/releases
16+
- Look through the issues already resolved:
17+
https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed
18+
19+
If you did not find what you're looking for,
20+
try the help of our community:
21+
22+
- Post to Github Discussions:
23+
https://github.com/netbox-community/netbox-docker/discussions
24+
- Join the `#netbox-docker` channel on our Slack:
25+
https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
26+
- Ask on the NetBox mailing list:
27+
https://groups.google.com/d/forum/netbox-discuss
28+
29+
Please don't open an issue to open a PR.
30+
Just submit the PR, that's good enough.
31+
- type: textarea
32+
id: current-behavior
33+
attributes:
34+
label: Current Behavior
35+
description: Please describe what you did and how you think it misbehaved
36+
placeholder: I tried to … by doing …, but it …
37+
validations:
38+
required: true
39+
- type: textarea
40+
id: expected-behavior
41+
attributes:
42+
label: Expected Behavior
43+
description: Please describe what you expected instead
44+
placeholder: I expected that … when I do …
45+
validations:
46+
required: true
47+
- type: input
48+
id: docker-compose-version
49+
attributes:
50+
label: Docker Compose Version
51+
description: Please paste the output of `docker-compose version`
52+
placeholder: Docker Compose version vX.Y.Z
53+
validations:
54+
required: true
55+
- type: textarea
56+
id: docker-version
57+
attributes:
58+
label: Docker Version
59+
description: Please paste the output of `docker version`
60+
render: text
61+
placeholder: |
62+
Client:
63+
Cloud integration: 1.0.17
64+
Version: 20.10.8
65+
API version: 1.41
66+
Go version: go1.16.6
67+
Git commit: 3967b7d
68+
Built: Fri Jul 30 19:55:20 2021
69+
OS/Arch: darwin/amd64
70+
Context: default
71+
Experimental: true
72+
73+
Server: Docker Engine - Community
74+
Engine:
75+
Version: 20.10.8
76+
API version: 1.41 (minimum version 1.12)
77+
Go version: go1.16.6
78+
Git commit: 75249d8
79+
Built: Fri Jul 30 19:52:10 2021
80+
OS/Arch: linux/amd64
81+
Experimental: false
82+
containerd:
83+
Version: 1.4.9
84+
GitCommit: e25210fe30a0a703442421b0f60afac609f950a3
85+
runc:
86+
Version: 1.0.1
87+
GitCommit: v1.0.1-0-g4144b63
88+
docker-init:
89+
Version: 0.19.0
90+
GitCommit: de40ad0
91+
validations:
92+
required: true
93+
- type: input
94+
id: git-rev
95+
attributes:
96+
label: The git Revision
97+
description: Please paste the output of `git rev-parse HEAD`
98+
validations:
99+
required: true
100+
- type: textarea
101+
id: git-status
102+
attributes:
103+
label: The git Status
104+
description: Please paste the output of `git status`
105+
render: text
106+
placeholder: |
107+
On branch main
108+
nothing to commit, working tree clean
109+
validations:
110+
required: true
111+
- type: input
112+
id: run-command
113+
attributes:
114+
label: Startup Command
115+
description: Please specify the command you used to start the project
116+
placeholder: docker compose up
117+
validations:
118+
required: true
119+
- type: textarea
120+
id: netbox-logs
121+
attributes:
122+
label: NetBox Logs
123+
description: Please paste the output of `docker-compose logs netbox` (or `docker compose logs netbox`)
124+
render: text
125+
placeholder: |
126+
netbox_1 | ⚙️ Applying database migrations
127+
netbox_1 | 🧬 loaded config '/etc/netbox/config/configuration.py'
128+
netbox_1 | 🧬 loaded config '/etc/netbox/config/a.py'
129+
netbox_1 | 🧬 loaded config '/etc/netbox/config/extra.py'
130+
netbox_1 | 🧬 loaded config '/etc/netbox/config/logging.py'
131+
netbox_1 | 🧬 loaded config '/etc/netbox/config/plugins.py'
132+
...
133+
validations:
134+
required: true
135+
- type: textarea
136+
id: docker-compose-override-yml
137+
attributes:
138+
label: Content of docker-compose.override.yml
139+
description: Please paste the output of `cat docker-compose.override.yml`
140+
render: yaml
141+
placeholder: |
142+
version: '3.4'
143+
services:
144+
netbox:
145+
ports:
146+
- '8080:8080'
147+
validations:
148+
required: true

‎.github/ISSUE_TEMPLATE/feature_request.md

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

‎.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Feature or Change Request
2+
description: Request a new feature or a change of the current behavior
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: |
7+
This issue type is to propose new features for the Docker setup.
8+
To just spin an idea, see the Github Discussions section, please.
9+
10+
Before asking for help, see these links first:
11+
12+
- See our troubleshooting section:
13+
https://github.com/netbox-community/netbox-docker/wiki/Troubleshooting
14+
- Have a look at the rest of the wiki:
15+
https://github.com/netbox-community/netbox-docker/wiki
16+
- Check the release notes:
17+
https://github.com/netbox-community/netbox-docker/releases
18+
- Look through the issues already resolved:
19+
https://github.com/netbox-community/netbox-docker/issues?q=is%3Aclosed
20+
21+
If you did not find what you're looking for,
22+
try the help of our community:
23+
24+
- Post to Github Discussions:
25+
https://github.com/netbox-community/netbox-docker/discussions
26+
- Join the `#netbox-docker` channel on our Slack:
27+
https://join.slack.com/t/netdev-community/shared_invite/zt-mtts8g0n-Sm6Wutn62q_M4OdsaIycrQ
28+
- Ask on the NetBox mailing list:
29+
https://groups.google.com/d/forum/netbox-discuss
30+
31+
Please don't open an issue to open a PR.
32+
Just submit the PR, that's good enough.
33+
- type: textarea
34+
id: desired-behavior
35+
attributes:
36+
label: Desired Behavior
37+
description: Please describe the desired behavior
38+
placeholder: To me, it would be useful, if … because …
39+
validations:
40+
required: true
41+
- type: textarea
42+
id: contrast-to-current
43+
attributes:
44+
label: Contrast to Current Behavior
45+
description: Please describe how the desired behavior is different from the current behavior
46+
placeholder: The current behavior is …, but this lacks …
47+
validations:
48+
required: true
49+
- type: textarea
50+
id: required-changes
51+
attributes:
52+
label: Required Changes
53+
description: If you can, please elaborate what changes will be required to implement the desired behavior
54+
placeholder: I suggest to change the file …
55+
validations:
56+
required: false
57+
- type: textarea
58+
id: discussion
59+
attributes:
60+
label: 'Discussion: Benefits and Drawbacks'
61+
description: |
62+
Please make your case here:
63+
- Why do you think this project and the community will benefit from your suggestion?
64+
- What are the drawbacks of this change? Is it backwards-compatible?
65+
- Anything else that you think is relevant to the discussion of this feature/change request.
66+
placeholder: I suggest to change the file …
67+
validations:
68+
required: false

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ RUN apk add --no-cache \
1717
make \
1818
musl-dev \
1919
openldap-dev \
20-
openssl-dev \
2120
postgresql-dev \
2221
py3-pip \
2322
python3-dev \
@@ -95,6 +94,7 @@ WORKDIR /opt/netbox/netbox
9594
# Must set permissions for '/opt/netbox/netbox/media' directory
9695
# to g+w so that pictures can be uploaded to netbox.
9796
RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
97+
&& chown -R unit:root media /opt/unit/ \
9898
&& chmod -R g+w media /opt/unit/ \
9999
&& cd /opt/netbox/ && /opt/netbox/venv/bin/python -m mkdocs build \
100100
--config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.0
1+
1.4.1

0 commit comments

Comments
 (0)