Skip to content

Commit c80fb19

Browse files
cimninecimnine
authored
Merge pull request #432 from netbox-community/develop
Version 1.0.2
2 parents 4dd7a51 + 74543ec commit c80fb19

File tree

83 files changed

+1240
-1039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1240
-1039
lines changed

‎.ecrc

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"Verbose": false,
3+
"Debug": false,
4+
"IgnoreDefaults": false,
5+
"SpacesAftertabs": false,
6+
"NoColor": false,
7+
"Exclude": [
8+
"LICENSE",
9+
"\\.initializers",
10+
"\\.vscode"
11+
],
12+
"AllowedContentTypes": [],
13+
"PassedFiles": [],
14+
"Disable": {
15+
// set these options to true to disable specific checks
16+
"EndOfLine": false,
17+
"Indentation": false,
18+
"InsertFinalNewline": false,
19+
"TrimTrailingWhitespace": false,
20+
"IndentSize": true,
21+
"MaxLineLength": false
22+
}
23+
}

‎.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
root = true
2+
3+
[*]
4+
end_of_line = lf
5+
insert_final_newline = true
6+
charset = utf-8
7+
indent_style = space
8+
indent_size = 2
9+
10+
[*.py]
11+
indent_size = 4

‎.flake8

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[flake8]
2+
max-line-length = 100
3+
extend-ignore = E203, W503
4+
per-file-ignores =
5+
configuration/*:E131,E251,E266,E302,E305,E501,E722
6+
startup_scripts/startup_script_utils/__init__.py:F401
7+
docker/*:E266,E722

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Before raising an issue here, answer the following questions for yourself, pleas
1616
* Have you updated to the latest version and tried again? (i.e. `git pull` and `docker-compose pull`)
1717
* Have you reset the project and tried again? (i.e. `docker-compose down -v`)
1818
* Are you confident that your problem is related to the Docker image or Docker Compose file this project provides?
19-
(Otherwise ask on the Netbox mailing list, please: https://groups.google.com/d/forum/netbox-discuss)
19+
(Otherwise ask on the NetBox mailing list, please: https://groups.google.com/d/forum/netbox-discuss)
2020
* Have you looked through the issues already resolved?
2121
2222
Please try this means to get help before opening an issue here:
2323
2424
* On the networktocode Slack in the #netbox-docker channel: http://slack.networktocode.com/
2525
* On the networktocode Slack in the #netbox channel: http://slack.networktocode.com/
26-
* On the Netbox mailing list: https://groups.google.com/d/forum/netbox-discuss
26+
* On the NetBox mailing list: https://groups.google.com/d/forum/netbox-discuss
2727
2828
Please don't open an issue when you have a PR ready. Just submit the PR, that's good enough.
2929

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
blank_issues_enabled: false
22
contact_links:
3-
- name: The \#netbox-docker Slack channel
4-
url: http://slack.networktocode.com/
5-
about: It's usually the quickest way to seek help when you're in trouble with regards to Netbox Docker.
6-
7-
- name: Github Discussions
3+
- name: Question
84
url: https://github.com/netbox-community/netbox-docker/discussions
9-
about: This is the right place to ask questions about how to use or do certain things with Netbox Docker.
5+
about: The Github Discussions are the right place to ask questions about how to use or do certain things with NetBox Docker.
6+
7+
- name: Chat
8+
url: http://slack.networktocode.com/
9+
about: 'Usually the quickest way to seek help with small issues is to join our #netbox-docker Slack channel.'
1010

11-
- name: Have you had a look at our Wiki?
11+
- name: Community Wiki
1212
url: https://github.com/netbox-community/netbox-docker/wiki
13-
about: Our wiki contains information for common problems and tips for operating Netbox Docker in production.
13+
about: |
14+
Our wiki contains information for common problems and tips for operating NetBox Docker in production.
15+
It's maintained by our excellent community.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ Before raising an issue here, answer the following questions for yourself, pleas
1515
* Have you had a look at the rest of the wiki? (https://github.com/netbox-community/netbox-docker/wiki)
1616
* Have you read the release notes recently (https://github.com/netbox-community/netbox-docker/releases)
1717
* Are you confident that your feature/change request is related to the Docker image or Docker Compose file this project provides?
18-
(Otherwise ask on the Netbox mailing list, please: https://groups.google.com/d/forum/netbox-discuss)
18+
(Otherwise ask on the NetBox mailing list, please: https://groups.google.com/d/forum/netbox-discuss)
1919
* Have you looked through the issues already resolved?
2020
2121
Please try this means to get help before opening an issue here:
2222
2323
* On the networktocode Slack in the #netbox-docker channel: http://slack.networktocode.com/
2424
* On the networktocode Slack in the #netbox channel: http://slack.networktocode.com/
25-
* On the Netbox mailing list: https://groups.google.com/d/forum/netbox-discuss
25+
* On the NetBox mailing list: https://groups.google.com/d/forum/netbox-discuss
2626
2727
Please don't open an issue when you have a PR ready. Just submit the PR, that's good enough.
2828

‎.github/workflows/push.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,29 @@ on:
99
- release
1010

1111
jobs:
12+
lint:
13+
runs-on: ubuntu-latest
14+
name: Checks syntax of our code
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: actions/setup-python@v2
18+
- name: Lint Code Base
19+
uses: github/super-linter@v3
20+
env:
21+
DEFAULT_BRANCH: develop
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
SUPPRESS_POSSUM: true
24+
LINTER_RULES_PATH: /
25+
VALIDATE_ALL_CODEBASE: false
26+
VALIDATE_DOCKERFILE: false
27+
FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
28+
29+
EDITORCONFIG_FILE_NAME: .ecrc
30+
DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml
31+
MARKDOWN_CONFIG_FILE: .markdown-lint.yml
32+
PYTHON_BLACK_CONFIG_FILE: pyproject.toml
33+
PYTHON_FLAKE8_CONFIG_FILE: .flake8
34+
PYTHON_ISORT_CONFIG_FILE: pyproject.toml
1235
build:
1336
continue-on-error: ${{ matrix.docker_from == 'alpine:edge' }}
1437
strategy:
@@ -23,7 +46,7 @@ jobs:
2346
- alpine:edge
2447
fail-fast: false
2548
runs-on: ubuntu-latest
26-
name: Builds new Netbox Docker Images
49+
name: Builds new NetBox Docker Images
2750
steps:
2851
- id: git-checkout
2952
name: Checkout

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- ./build.sh develop
1919
fail-fast: false
2020
runs-on: ubuntu-latest
21-
name: Builds new Netbox Docker Images
21+
name: Builds new NetBox Docker Images
2222
steps:
2323
- id: git-checkout
2424
name: Checkout

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ configuration/*
99
configuration/ldap/*
1010
!configuration/ldap/ldap_config.py
1111
prometheus.yml
12+
super-linter.log

‎.hadolint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ignored:
2+
- DL3006
3+
- DL3018

0 commit comments

Comments
 (0)