Skip to content

Commit 27bf52c

Browse files
authored
Merge pull request netbox-community#1322 from netbox-community/develop
Version 3.0.2
2 parents 5add31e + 5dea11c commit 27bf52c

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

.github/workflows/release.yml

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
version: "lab:latest"
5757
driver: cloud
5858
endpoint: "netboxcommunity/netbox-default"
59+
if: steps.check-build-needed.outputs.skipped != 'true'
5960
# quay.io
6061
- id: quay-io-login
6162
name: Login to Quay.io

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG FROM
2-
FROM ${FROM} as builder
2+
FROM ${FROM} AS builder
33

44
RUN export DEBIAN_FRONTEND=noninteractive \
55
&& apt-get update -qq \
@@ -46,7 +46,7 @@ RUN \
4646
###
4747

4848
ARG FROM
49-
FROM ${FROM} as main
49+
FROM ${FROM} AS main
5050

5151
RUN export DEBIAN_FRONTEND=noninteractive \
5252
&& apt-get update -qq \
@@ -64,15 +64,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \
6464
openssl \
6565
python3 \
6666
tini \
67-
&& curl --silent --output /etc/apt/keyrings/nginx-keyring.gpg \
67+
&& curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \
6868
https://unit.nginx.org/keys/nginx-keyring.gpg \
69-
&& echo "deb [signed-by=/etc/apt/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ mantic unit" \
69+
&& echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ noble unit" \
7070
> /etc/apt/sources.list.d/unit.list \
7171
&& apt-get update -qq \
7272
&& apt-get install \
7373
--yes -qq --no-install-recommends \
74-
unit=1.32.1-1~mantic \
75-
unit-python3.12=1.32.1-1~mantic \
74+
unit=1.33.0-1~noble \
75+
unit-python3.12=1.33.0-1~noble \
7676
&& rm -rf /var/lib/apt/lists/*
7777

7878
COPY --from=builder /opt/netbox/venv /opt/netbox/venv

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.1
1+
3.0.2

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
netbox: &netbox
3-
image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.1}
3+
image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.2}
44
depends_on:
55
- postgres
66
- redis

requirements-container.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
22
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
33
dulwich==0.22.1
44
python3-saml==1.16.0 --no-binary lxml,xmlsec
5-
sentry-sdk[django]==2.13.0
5+
sentry-sdk[django]==2.14.0

0 commit comments

Comments
 (0)