Compare commits

..

12 Commits

Author SHA1 Message Date
D-Ev_io 753cb98ca3 change port 8000 to 8080 2024-12-02 22:17:07 +02:00
D-Ev_io b9836c3af2 Merge remote-tracking branch 'origin/release' into release
# Conflicts:
#	docker-compose.yml
2024-12-02 22:15:18 +02:00
Tobias Genannt 27bf52cf3e
Merge pull request #1322 from netbox-community/develop
Version 3.0.2
2024-09-19 14:21:53 +02:00
Tobias Genannt 5dea11c4d4 Preparation for 3.0.2 2024-09-19 13:43:31 +02:00
Tobias Genannt 35c19d0fc8 Upgrade Nginx Unit to version 1.33 2024-09-18 17:56:55 +02:00
Tobias Genannt cd42632628
Merge pull request #1315 from netbox-community/renovate/sentry-sdk-2.x
Update dependency sentry-sdk to v2.14.0
2024-09-09 17:24:58 +02:00
renovate[bot] 09c897aa22
Update dependency sentry-sdk to v2.14.0 2024-09-09 14:16:13 +00:00
Tobias Genannt 656b118826
Merge pull request #1309 from tobiasge/fix-step-skipping
When no build is needed don't create the buildx config
2024-09-06 10:30:30 +02:00
Tobias Genannt f134a44bc7 When no build is needed don't create the buildx config 2024-09-06 09:50:12 +02:00
D-Ev_io 8b3ded51b5 change port 8000 to 8080 2024-04-21 14:51:01 +03:00
D-Ev_io 302f6464bb change port 8000 to 8080 2024-04-21 14:50:47 +03:00
D-Ev_io dabfc38a92 enable docker-compose.override.yml 2024-04-21 14:41:35 +03:00
7 changed files with 31 additions and 10 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

1
.gitignore vendored
View File

@ -1,7 +1,6 @@
*.sql.gz *.sql.gz
.netbox .netbox
.python-version .python-version
docker-compose.override.yml
*.pem *.pem
configuration/* configuration/*
!configuration/configuration.py !configuration/configuration.py

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

@ -0,0 +1,21 @@
services:
netbox:
ports:
- "8000:8080"
# If you want the Nginx unit status page visible from the
# outside of the container add the following port mapping:
# - "8001:8081"
# healthcheck:
# Time for which the health check can fail after the container is started.
# This depends mostly on the performance of your database. On the first start,
# when all tables need to be created the start_period should be higher than on
# subsequent starts. For the first start after major version upgrades of NetBox
# the start_period might also need to be set higher.
# Default value in our docker-compose.yml is 60s
# start_period: 90s
# environment:
# SKIP_SUPERUSER: "false"
# SUPERUSER_API_TOKEN: ""
# SUPERUSER_EMAIL: ""
# SUPERUSER_NAME: ""
# SUPERUSER_PASSWORD: ""

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