Merge 1815408e73 into 0e66fbad47

Merge pull request #1478 from dawnstrider/develop
Fixed typo for BUILDX_PLATFORM variable
2025-12-10 05:42:36 +00:00 · 2025-07-08 15:23:10 +10: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
2 changed files with 8 additions and 3 deletions
--- 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'
@ -105,6 +105,9 @@ GH_ACTION   If defined, special 'echo' statements are enabled that set the
 CHECK_ONLY  Only checks if the build is needed and sets the GH Action output.
            ${_GREEN}Default:${_CLEAR} undefined
            
+NO_CACHE    Disables Docker Build Cache.
+            ${_GREEN}Default:${_CLEAR} undefined
+
 ${_BOLD}Examples:${_CLEAR}

 ${0} main
@ -409,7 +412,9 @@ fi
 if [ -n "${NO_PROXY}" ]; then
  DOCKER_BUILD_ARGS+=(--build-arg "no_proxy=${NO_PROXY}")
 fi
-
+if [ -n "${NO_CACHE}" ]; then
+  DOCKER_BUILD_ARGS+=(--no-cache)
+fi
 DOCKER_BUILD_ARGS+=(--platform "${BUILDX_PLATFORM-linux/amd64}")
 if [ "${2}" == "--push" ]; then
  # output type=docker does not work with pushing
--- 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
Matt Gaynor	d5697d1fb1	Merge `1815408e73` into `0e66fbad47`	2025-07-08 15:23:10 +10: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
Matt Gaynor	1815408e73	Add NO_CACHE to build.sh Add the ability to disable Docker build cache	2025-02-17 13:13:59 +00:00