From 83ba6762cc43d9db581b979bb5e3445669e46cc2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 25 Nov 2024 18:33:56 +0100 Subject: Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145). Signed-off-by: Daniel Baumann --- .github/dockerfiles/Dockerfile.build_test | 5 ++++- .github/dockerfiles/Dockerfile.clang | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to '.github/dockerfiles') diff --git a/.github/dockerfiles/Dockerfile.build_test b/.github/dockerfiles/Dockerfile.build_test index c275d61d6..80d97319d 100644 --- a/.github/dockerfiles/Dockerfile.build_test +++ b/.github/dockerfiles/Dockerfile.build_test @@ -1,4 +1,7 @@ -ARG BASE +# The default value is overridden in every Dockerfile usage, but adding it here helps avoid issues with +# CI checks that require a non-empty or valid base image name. See more details here: +# https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/ +ARG BASE="netdata" FROM ${BASE} diff --git a/.github/dockerfiles/Dockerfile.clang b/.github/dockerfiles/Dockerfile.clang index 869254198..4864fa0d4 100644 --- a/.github/dockerfiles/Dockerfile.clang +++ b/.github/dockerfiles/Dockerfile.clang @@ -16,4 +16,4 @@ WORKDIR /netdata COPY . . # Build Netdata -RUN ./netdata-installer.sh --dont-wait --dont-start-it --disable-go --require-cloud +RUN ./netdata-installer.sh --dont-wait --dont-start-it --disable-go -- cgit v1.2.3