Merge pull request #734 from netbox-community/develop

Version 1.6.1
This commit is contained in:
Tobias Genannt 2022-04-06 09:58:45 +02:00 committed by GitHub
commit 61a3afbb3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions

View File

@ -13,11 +13,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Checks syntax of our code name: Checks syntax of our code
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
with: with:
# Full git history is needed to get a proper list of changed files within `super-linter` # Full git history is needed to get a proper list of changed files within `super-linter`
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-python@v2 - uses: actions/setup-python@v3
- name: Lint Code Base - name: Lint Code Base
uses: github/super-linter@v4 uses: github/super-linter@v4
env: env:
@ -52,7 +52,7 @@ jobs:
steps: steps:
- id: git-checkout - id: git-checkout
name: Checkout name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- id: docker-build - id: docker-build
name: Build the image from '${{ matrix.docker_from }}' with '${{ matrix.build_cmd }}' name: Build the image from '${{ matrix.docker_from }}' with '${{ matrix.build_cmd }}'
run: ${{ matrix.build_cmd }} run: ${{ matrix.build_cmd }}

View File

@ -24,7 +24,7 @@ jobs:
steps: steps:
- -
name: Checkout name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
- -
name: Get Version of NetBox Docker name: Get Version of NetBox Docker
run: | run: |

View File

@ -1 +1 @@
1.6.0 1.6.1

View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
netbox: &netbox netbox: &netbox
image: netboxcommunity/netbox:${VERSION-v3.1-1.6.0} image: netboxcommunity/netbox:${VERSION-v3.2-1.6.1}
depends_on: depends_on:
- postgres - postgres
- redis - redis

View File

@ -1,6 +1,5 @@
django-auth-ldap==4.0.0 django-auth-ldap==4.0.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.12.3 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.12.3
google-crc32c==1.3.0 google-crc32c==1.3.0
napalm==3.3.1 napalm==3.4.0
ruamel.yaml==0.17.21 ruamel.yaml==0.17.21
tzdata==2021.5