From ab84e9713fc21badea41177d6244651d4536acbb Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:22:53 +0100 Subject: [PATCH 1/5] manually download test data --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 97e00ae56..0f2a9619b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \ ADD . /app WORKDIR /app/build/create_binaries/ RUN julia --project -e "using Pkg; Pkg.instantiate()" +RUN julia --project download_test_data.jl RUN julia --project create_app.jl ENTRYPOINT [ "/app/build/create_binaries/wflow_bundle/bin/wflow_cli" ] From 810e4b4e8bb61fb9381f7113e43462f00b536a33 Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Wed, 13 Nov 2024 15:59:21 +0100 Subject: [PATCH 2/5] clean up test data --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 0f2a9619b..8346e6b18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,6 @@ WORKDIR /app/build/create_binaries/ RUN julia --project -e "using Pkg; Pkg.instantiate()" RUN julia --project download_test_data.jl RUN julia --project create_app.jl +RUN rm -rf /app/test/data/* ENTRYPOINT [ "/app/build/create_binaries/wflow_bundle/bin/wflow_cli" ] From 8490472b4c89b5d22d3207921eda1d2e69ada2a8 Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:06:31 +0100 Subject: [PATCH 3/5] combine run steps --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8346e6b18..189f2f21e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,9 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* ADD . /app WORKDIR /app/build/create_binaries/ -RUN julia --project -e "using Pkg; Pkg.instantiate()" -RUN julia --project download_test_data.jl -RUN julia --project create_app.jl -RUN rm -rf /app/test/data/* +RUN julia --project -e "using Pkg; Pkg.instantiate();" && \ + julia --project download_test_data.jl && \ + julia --project create_app.jl && \ + rm -rf /app/test/data/* ENTRYPOINT [ "/app/build/create_binaries/wflow_bundle/bin/wflow_cli" ] From 1286d86e7e0024c0299a702d81254ce577c15d8f Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:20:35 +0100 Subject: [PATCH 4/5] Update changelog.qmd --- docs/changelog.qmd | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog.qmd b/docs/changelog.qmd index 65c49f596..c5ad6760f 100644 --- a/docs/changelog.qmd +++ b/docs/changelog.qmd @@ -15,6 +15,7 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). computation, as it is already part of parameter `kh_0`. - Mutating BMI model control functions (`update`, `update_until` and `finalize`) and extended mutating BMI functions (`load_state` and `save_state`) should return `nothing`. +- Added downloading of testdata to Dockerfile, to ensure an image was able to build. ### Changed - Removed vertical concepts `HBV` and `FLEXTopo`. From 0b63bdcf6d1cf5a27c44d8cbd1a1bf783943e9fd Mon Sep 17 00:00:00 2001 From: JoostBuitink <44062204+JoostBuitink@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:22:22 +0100 Subject: [PATCH 5/5] update PR template to match quarto format --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 88e124558..ed867ce49 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -9,7 +9,7 @@ Explain how you addressed the bug/feature request, what choices you made and why - [ ] Branch is up to date with `master` - [ ] Tests & pre-commit hooks pass - [ ] Updated documentation if needed -- [ ] Updated changelog.md if needed +- [ ] Updated changelog.qmd if needed ## Additional Notes (optional) Add any additional notes or information that may be helpful. \ No newline at end of file