Merge pull request #1322 from netbox-community/develop

Version 3.0.2
This commit is contained in:
Tobias Genannt 2024-09-19 14:21:53 +02:00 committed by GitHub
commit 27bf52cf3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 9 deletions

View File

@ -56,6 +56,7 @@ jobs:
version: "lab:latest" version: "lab:latest"
driver: cloud driver: cloud
endpoint: "netboxcommunity/netbox-default" endpoint: "netboxcommunity/netbox-default"
if: steps.check-build-needed.outputs.skipped != 'true'
# quay.io # quay.io
- id: quay-io-login - id: quay-io-login
name: Login to Quay.io name: Login to Quay.io

View File

@ -1,5 +1,5 @@
ARG FROM ARG FROM
FROM ${FROM} as builder FROM ${FROM} AS builder
RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -qq \ && apt-get update -qq \
@ -46,7 +46,7 @@ RUN \
### ###
ARG FROM ARG FROM
FROM ${FROM} as main FROM ${FROM} AS main
RUN export DEBIAN_FRONTEND=noninteractive \ RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update -qq \ && apt-get update -qq \
@ -64,15 +64,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
openssl \ openssl \
python3 \ python3 \
tini \ tini \
&& curl --silent --output /etc/apt/keyrings/nginx-keyring.gpg \ && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \
https://unit.nginx.org/keys/nginx-keyring.gpg \ https://unit.nginx.org/keys/nginx-keyring.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ mantic unit" \ && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ noble unit" \
> /etc/apt/sources.list.d/unit.list \ > /etc/apt/sources.list.d/unit.list \
&& apt-get update -qq \ && apt-get update -qq \
&& apt-get install \ && apt-get install \
--yes -qq --no-install-recommends \ --yes -qq --no-install-recommends \
unit=1.32.1-1~mantic \ unit=1.33.0-1~noble \
unit-python3.12=1.32.1-1~mantic \ unit-python3.12=1.33.0-1~noble \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY --from=builder /opt/netbox/venv /opt/netbox/venv COPY --from=builder /opt/netbox/venv /opt/netbox/venv

View File

@ -1 +1 @@
3.0.1 3.0.2

View File

@ -1,6 +1,6 @@
services: services:
netbox: &netbox netbox: &netbox
image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.1} image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.2}
depends_on: depends_on:
- postgres - postgres
- redis - redis

View File

@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
dulwich==0.22.1 dulwich==0.22.1
python3-saml==1.16.0 --no-binary lxml,xmlsec python3-saml==1.16.0 --no-binary lxml,xmlsec
sentry-sdk[django]==2.13.0 sentry-sdk[django]==2.14.0