From 31b3f32f0eaf9f241186fa3f3b702c7f679f252d Mon Sep 17 00:00:00 2001 From: Ning Shang Date: Thu, 1 May 2025 10:21:24 -0700 Subject: [PATCH 1/2] Improve documentation and debugging info Update README.md to provide more information about `extern_data`. Do not redirect stderr to `/dev/null` in `build_container.sh` to make debuggin in CI easier. Note that the caller of this script can still do the redirect at will. --- README.md | 3 +++ pkg/r10e-docker/files/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fbce0c6..7a8f551 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,9 @@ optional. container. Unlike in "artifacts", the external data path can be either a file or a directory. However, the source and destination paths for the same external datum must be of the same type (file or directory) when instantiated. + - "src" shall be a *relative path* to the project diectory where `r10edocker` + is run + - "dest" shall be an *absolut path* in the final Docker container image - "include_ca_bundle" dictates a root CA bundle from the `cacert` package of nixpkgs will be installed in the container image. If the value of this field is set to `true` the root CA bundle will be included in the container, which diff --git a/pkg/r10e-docker/files/Makefile b/pkg/r10e-docker/files/Makefile index 2d1b7dd..9c00685 100644 --- a/pkg/r10e-docker/files/Makefile +++ b/pkg/r10e-docker/files/Makefile @@ -6,7 +6,7 @@ all: r10e-docker .PHONY: r10e-docker r10e-docker: - $(mkfile_dir)/build_container.sh 2>/dev/null + $(mkfile_dir)/build_container.sh .PHONY: clean clean: From 151ea46d22270026ed9f9cefc89862ef99e370ea Mon Sep 17 00:00:00 2001 From: Ning Shang Date: Thu, 1 May 2025 10:29:01 -0700 Subject: [PATCH 2/2] Fix a typo A typo fix. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a8f551..ac5e776 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,7 @@ optional. external datum must be of the same type (file or directory) when instantiated. - "src" shall be a *relative path* to the project diectory where `r10edocker` is run - - "dest" shall be an *absolut path* in the final Docker container image + - "dest" shall be an *absolute path* in the final Docker container image - "include_ca_bundle" dictates a root CA bundle from the `cacert` package of nixpkgs will be installed in the container image. If the value of this field is set to `true` the root CA bundle will be included in the container, which