Merge 7bc4d78388 into 0e66fbad47

Merge pull request #1478 from dawnstrider/develop
Fixed typo for BUILDX_PLATFORM variable
2025-12-10 13:52:38 +00:00 · 2025-07-08 08:54:10 +02:00 · 2025-07-08 07:19:23 +02:00 · 2025-07-07 23:08:49 +02:00 · 2025-07-07 16:04:16 +02:00 · 2025-07-07 13:43:56 +00:00
3 changed files with 5 additions and 3 deletions
--- 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/build.sh
+++ b/build.sh
@ -62,7 +62,7 @@ DOCKERFILE  The name of Dockerfile to use.
 DOCKER_FROM The base image to use.
            ${_GREEN}Default:${_CLEAR} 'ubuntu:24.04'

-BUILDX_PLATFORMS
+BUILDX_PLATFORM
            Specifies the platform(s) to build the image for.
            ${_CYAN}Example:${_CLEAR} 'linux/amd64,linux/arm64'
            ${_GREEN}Default:${_CLEAR} 'linux/amd64'
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -1,5 +1,5 @@
 django-auth-ldap==5.2.0
-dulwich==0.23.1
+dulwich==0.23.2
 python3-saml==1.16.0
 --no-binary lxml
 --no-binary xmlsec
Author	SHA1	Message	Date
waja	73734f4390	Merge `7bc4d78388` into `0e66fbad47`	2025-07-08 08:54:10 +02:00
Tobias Genannt	0e66fbad47	Merge pull request #1478 from dawnstrider/develop Some checks failed push / Checks syntax of our code (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details Fixed typo for BUILDX_PLATFORM variable	2025-07-08 07:19:23 +02:00
dawnstrider	3320c5d82f	Fixed typo for BUILDX_PLATFORM variable The help prints the variable name as BUILDX_PLATFORMS whereas the code uses BUILDX_PLATFORM	2025-07-07 23:08:49 +02:00
Tobias Genannt	8a58c5a273	Merge pull request #1477 from netbox-community/renovate/dulwich-0.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 dulwich to v0.23.2	2025-07-07 16:04:16 +02:00
renovate[bot]	21232c8ce1	Update dependency dulwich to v0.23.2	2025-07-07 13:43:56 +00:00
Jan Wagner	7bc4d78388	Adding --checksum to avoid CIS-DI-0009 Add hadolint inline ignore to prevent ignoring it globally	2025-05-16 15:47:14 +02:00
Tobias Genannt	477decd80a	Merge pull request #1450 from netbox-community/develop Version 3.3.0	2025-05-05 07:51:26 +02:00