Merge 7c22dd8656 into e9a8e14aa8

Disable zizmor for now
Disable Trivy for now
2025-12-11 06:12:37 +00:00 · 2025-09-03 08:56:33 +02:00 · 2025-09-03 08:10:15 +02:00 · 2025-09-03 07:59:56 +02:00 · 2025-09-03 07:50:41 +02:00 · 2025-09-02 07:07:46 +02:00
5 changed files with 8 additions and 4 deletions
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@ -40,6 +40,8 @@ jobs:
          VALIDATE_DOCKERFILE: false
          VALIDATE_GITLEAKS: false
          VALIDATE_JSCPD: false
+          VALIDATE_TRIVY: false
+          VALIDATE_GITHUB_ACTIONS_ZIZMOR: false
          FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*)
          EDITORCONFIG_FILE_NAME: .editorconfig-checker.json
          DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml
--- a/4
+++ b/4
@ -46,8 +46,10 @@ RUN \
 ARG FROM
 FROM ${FROM} AS main

+ARG NGINX_KEYRING_SHA256_SUM=7d3d5a7adf37e17d6882e2f6f55324b9a8f978ef3c99c50fe801af67c9847c91
+# hadolint ignore=DL3020
+ADD --chown=0:0 --chmod=444 --checksum=sha256:${NGINX_KEYRING_SHA256_SUM} https://unit.nginx.org/keys/nginx-keyring.gpg /usr/share/keyrings/nginx-keyring.gpg
 COPY docker/unit.list /etc/apt/sources.list.d/unit.list
-ADD --chmod=444 --chown=0:0 https://unit.nginx.org/keys/nginx-keyring.gpg /usr/share/keyrings/nginx-keyring.gpg
 RUN export DEBIAN_FRONTEND=noninteractive \
    && apt-get update -qq \
    && apt-get upgrade \
--- a/2
+++ b/2
@ -1 +1 @@
-3.3.0
+3.4.0
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,6 +1,6 @@
 services:
  netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.3-3.3.0}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.4-3.4.0}
    depends_on:
      - postgres
      - redis
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -3,4 +3,4 @@ dulwich==0.24.1
 python3-saml==1.16.0
 --no-binary lxml
 --no-binary xmlsec
-sentry-sdk[django]==2.35.1
+sentry-sdk[django]==2.35.2
Author	SHA1	Message	Date
waja	da9ca27d96	Merge `7c22dd8656` into `e9a8e14aa8`	2025-09-03 08:56:33 +02:00
Tobias Genannt	e9a8e14aa8	Disable zizmor for now Some checks are pending push / Checks syntax of our code (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details	2025-09-03 08:10:15 +02:00
Tobias Genannt	1b0da4048b	Disable Trivy for now	2025-09-03 07:59:56 +02:00
Tobias Genannt	e61aba8388	Preparation for 3.4.0	2025-09-03 07:50:41 +02:00
Tobias Genannt	c4f90b7b34	Merge pull request #1507 from netbox-community/renovate/sentry-sdk-2.x Some checks are pending push / Checks syntax of our code (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details Update dependency sentry-sdk to v2.35.2	2025-09-02 07:07:46 +02:00
renovate[bot]	8dac9f2dc7	Update dependency sentry-sdk to v2.35.2	2025-09-01 21:58:31 +00:00
Jan Wagner	7c22dd8656	Adding --checksum to avoid CIS-DI-0009 Add hadolint inline ignore to prevent ignoring it globally	2025-07-18 18:23:46 +02:00
 @ -1 +1 @@
 .3.0
 .4.0