Message ID | 20230810153640.1879717-3-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | some testing and gdbstub fixes | expand |
On 10/08/2023 17.36, Alex Bennée wrote: > Even with --quiet docker will spam the sha256 to the console. Avoid > this by redirecting stdout. While we are at it fix the name we echo > which was broken during 0b1a649047 (tests/docker: use direct RUNC call > to build containers). > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 142e8605ee..dfabafab92 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -46,9 +46,9 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker > --build-arg BUILDKIT_INLINE_CACHE=1 \ > $(if $(NOUSER),, \ > --build-arg USER=$(USER) \ > - --build-arg UID=$(UID)) \ > - -t qemu/$* - < $<, \ > - "BUILD", $1) > + --build-arg UID=$(UID)) \ > + -t qemu/$* - < $< $(if $V,,> /dev/null),\ > + "BUILD", $*) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 142e8605ee..dfabafab92 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -46,9 +46,9 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker --build-arg BUILDKIT_INLINE_CACHE=1 \ $(if $(NOUSER),, \ --build-arg USER=$(USER) \ - --build-arg UID=$(UID)) \ - -t qemu/$* - < $<, \ - "BUILD", $1) + --build-arg UID=$(UID)) \ + -t qemu/$* - < $< $(if $V,,> /dev/null),\ + "BUILD", $*) # Special rule for debootstraped binfmt linux-user images docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker
Even with --quiet docker will spam the sha256 to the console. Avoid this by redirecting stdout. While we are at it fix the name we echo which was broken during 0b1a649047 (tests/docker: use direct RUNC call to build containers). Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)