Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.8.0 #1125

Merged
merged 37 commits into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c798e88
Update dependency dulwich to v0.21.6
renovate[bot] Sep 2, 2023
caba1b3
Merge pull request #1066 from netbox-community/renovate/dulwich-0.x
tobiasge Sep 2, 2023
e452004
Update Nginx unit to 1.31
tobiasge Sep 3, 2023
bc6e4f8
Update dependency django-storages to v1.14
renovate[bot] Sep 5, 2023
4513377
Merge pull request #1070 from netbox-community/renovate/django-storag…
tobiasge Sep 5, 2023
364555e
Update actions/checkout action to v4
renovate[bot] Sep 5, 2023
fe27ebc
Merge pull request #1069 from netbox-community/renovate/actions-check…
tobiasge Sep 5, 2023
bcafc43
Merge pull request #1067 from tobiasge/unit-update
tobiasge Sep 5, 2023
c473fcc
Update docker/setup-buildx-action action to v3
renovate[bot] Sep 12, 2023
f42e78e
Merge pull request #1075 from netbox-community/renovate/docker-setup-…
cimnine Sep 12, 2023
8b8447f
Update docker/setup-qemu-action action to v3
renovate[bot] Sep 12, 2023
0594d2c
Merge pull request #1076 from netbox-community/renovate/docker-setup-…
cimnine Sep 12, 2023
e6fedf1
Update docker/login-action action to v3
renovate[bot] Sep 12, 2023
164b013
Merge pull request #1074 from netbox-community/renovate/docker-login-…
cimnine Sep 12, 2023
0603f1e
Update docker.io/postgres Docker tag to v16
renovate[bot] Sep 15, 2023
252ab33
Merge pull request #1082 from netbox-community/renovate/docker.io-pos…
tobiasge Sep 23, 2023
87159b5
Update dependency psycopg to v3.1.11
renovate[bot] Sep 23, 2023
d0fbb37
Merge pull request #1090 from netbox-community/renovate/psycopg-3.x
tobiasge Sep 23, 2023
714a132
Update postgres Docker tag to v16
renovate[bot] Sep 23, 2023
830d498
Merge pull request #1083 from netbox-community/renovate/postgres-16.x
tobiasge Sep 23, 2023
f1de85d
Update dependency psycopg to v3.1.12
renovate[bot] Sep 27, 2023
9679936
Merge pull request #1091 from netbox-community/renovate/psycopg-3.x
tobiasge Sep 27, 2023
1a3ace9
Update dependency django-storages to v1.14.1
renovate[bot] Sep 29, 2023
17b9569
Merge pull request #1095 from netbox-community/renovate/django-storag…
tobiasge Sep 30, 2023
e8fa63d
Update dependency django-storages to v1.14.2
renovate[bot] Oct 9, 2023
aaaa628
Merge pull request #1100 from netbox-community/renovate/django-storag…
tobiasge Oct 9, 2023
4680e59
Update dependency django-auth-ldap to v4.6.0
renovate[bot] Oct 9, 2023
1e681f3
Merge pull request #1097 from netbox-community/renovate/django-auth-l…
tobiasge Oct 9, 2023
5104978
Update dependency python3-saml to v1.16.0
renovate[bot] Oct 9, 2023
e020b46
Merge pull request #1101 from netbox-community/renovate/python3-saml-1.x
tobiasge Oct 9, 2023
33430fd
Update actions/setup-python action to v5
renovate[bot] Dec 6, 2023
d7866d5
Update dependency psycopg to v3.1.16
renovate[bot] Dec 19, 2023
d72facf
Merge pull request #1122 from netbox-community/renovate/actions-setup…
tobiasge Dec 19, 2023
651bbc4
Merge pull request #1115 from netbox-community/renovate/psycopg-3.x
tobiasge Dec 19, 2023
7e1750d
Update dependency dulwich to v0.21.7
renovate[bot] Dec 19, 2023
b5c12a8
Merge pull request #1120 from netbox-community/renovate/dulwich-0.x
tobiasge Dec 19, 2023
dfa1904
Preparation for 2.8.0
tobiasge Jan 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
runs-on: ubuntu-latest
name: Checks syntax of our code
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Full git history is needed to get a proper
# list of changed files within `super-linter`
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
- name: Lint Code Base
Expand Down Expand Up @@ -62,13 +62,13 @@ jobs:
steps:
- id: git-checkout
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- id: qemu-setup
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- id: buildx-setup
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- id: docker-build
name: Build the image for '${{ matrix.platform }}' with '${{ matrix.build_cmd }}'
run: ${{ matrix.build_cmd }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
steps:
- id: source-checkout
name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- id: set-netbox-docker-version
name: Get Version of NetBox Docker
run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT"
shell: bash
- id: qemu-setup
name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- id: buildx-setup
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- id: docker-build
name: Build the image with '${{ matrix.build_cmd }}'
run: ${{ matrix.build_cmd }}
Expand All @@ -51,7 +51,7 @@ jobs:
# docker.io
- id: docker-io-login
name: Login to docker.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: docker.io
username: ${{ secrets.dockerhub_username }}
Expand All @@ -60,7 +60,7 @@ jobs:
# quay.io
- id: quay-io-login
name: Login to Quay.io
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: quay.io
username: ${{ secrets.quayio_username }}
Expand All @@ -69,7 +69,7 @@ jobs:
# ghcr.io
- id: ghcr-io-login
name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -qq \
&& apt-get install \
--yes -qq --no-install-recommends \
unit=1.30.0-1~lunar \
unit-python3.11=1.30.0-1~lunar \
unit=1.31.1-1~lunar \
unit-python3.11=1.31.1-1~lunar \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder /opt/netbox/venv /opt/netbox/venv
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
2.8.0
2 changes: 1 addition & 1 deletion docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
interval: 15s
test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1"
postgres:
image: postgres:15-alpine
image: postgres:16-alpine
env_file: env/postgres.env
healthcheck:
test: "pg_isready -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER" ## $$ because of docker-compose
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'
services:
netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v3.6-2.7.0}
image: docker.io/netboxcommunity/netbox:${VERSION-v3.7-2.8.0}
depends_on:
- postgres
- redis
Expand Down Expand Up @@ -47,7 +47,7 @@ services:

# postgres
postgres:
image: docker.io/postgres:15-alpine
image: docker.io/postgres:16-alpine
env_file: env/postgres.env
volumes:
- netbox-postgres-data:/var/lib/postgresql/data
Expand Down
10 changes: 5 additions & 5 deletions requirements-container.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
django-auth-ldap==4.5.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2
dulwich==0.21.5
psycopg[c,pool]==3.1.10
python3-saml==1.15.0
django-auth-ldap==4.6.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.2
dulwich==0.21.7
psycopg[c,pool]==3.1.16
python3-saml==1.16.0