From 4cfb86bff57e7a035a7502fe9e98cc757cb81673 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 27 Mar 2026 11:38:41 +0100 Subject: [PATCH 1/4] Add /workdir/external/simtools to git safedir --- docker/Dockerfile-simtools-dev | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile-simtools-dev b/docker/Dockerfile-simtools-dev index 8b62ead814..88d09fca49 100644 --- a/docker/Dockerfile-simtools-dev +++ b/docker/Dockerfile-simtools-dev @@ -40,6 +40,7 @@ RUN { \ printf '%s\n' "fi"; \ printf '%s\n' "git config --global --add safe.directory \"/workdir\""; \ printf '%s\n' "git config --global --add safe.directory \"/workdir/external\""; \ + printf '%s\n' "git config --global --add safe.directory \"/workdir/external\simtools\""; \ } > /etc/profile.d/git_safe_dir.sh # Install simtools (main branch) From a46ccbb187737481374dfab671e2aa7137d48540 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 27 Mar 2026 11:43:21 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- docker/Dockerfile-simtools-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-simtools-dev b/docker/Dockerfile-simtools-dev index 88d09fca49..678c596a90 100644 --- a/docker/Dockerfile-simtools-dev +++ b/docker/Dockerfile-simtools-dev @@ -40,7 +40,7 @@ RUN { \ printf '%s\n' "fi"; \ printf '%s\n' "git config --global --add safe.directory \"/workdir\""; \ printf '%s\n' "git config --global --add safe.directory \"/workdir/external\""; \ - printf '%s\n' "git config --global --add safe.directory \"/workdir/external\simtools\""; \ + printf '%s\n' "git config --global --add safe.directory \"/workdir/external/simtools\""; \ } > /etc/profile.d/git_safe_dir.sh # Install simtools (main branch) From 217be9d6e7007ea98c49d088e3c036663a6e2253 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 27 Mar 2026 12:06:44 +0100 Subject: [PATCH 3/4] bash -lc --- docker/README.md | 4 ++-- docs/source/developer-guide/getting_started_as_developer.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/README.md b/docker/README.md index 694300e059..e8250fc685 100644 --- a/docker/README.md +++ b/docker/README.md @@ -7,11 +7,11 @@ See the [simtools container documentation](https://gammasim.github.io/simtools/u For convenience, the command to use a container as developer is repeated here: ```bash -podman run --rm -it -v "$(pwd)/:/workdir/external" ghcr.io/gammasim/simtools-dev:latest bash -c "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" +podman run --rm -it -v "$(pwd)/:/workdir/external" ghcr.io/gammasim/simtools-dev:latest bash -lc "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" ``` In case a local database is used: ```bash -podman run --rm -it -v "$(pwd)/:/workdir/external" --network simtools-mongo-network ghcr.io/gammasim/simtools-dev:latest bash -c "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" +podman run --rm -it -v "$(pwd)/:/workdir/external" --network simtools-mongo-network ghcr.io/gammasim/simtools-dev:latest bash -lc "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" ``` diff --git a/docs/source/developer-guide/getting_started_as_developer.md b/docs/source/developer-guide/getting_started_as_developer.md index edca19c0b2..296fb6cfac 100644 --- a/docs/source/developer-guide/getting_started_as_developer.md +++ b/docs/source/developer-guide/getting_started_as_developer.md @@ -34,7 +34,7 @@ The following steps outline how to set up the development environment using cont ```bash podman run --rm -it -v "$(pwd)/external:/workdir/external" \ ghcr.io/gammasim/simtools-dev:latest \ - bash -c "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" + bash -lc "source /workdir/env/bin/activate && cd /workdir/external/simtools && pip install -e . && bash" ``` The container includes a CORSIKA and sim_telarray installation; From ff20dd324f20b1f87266710b274999cd34b5cb60 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Fri, 27 Mar 2026 12:08:24 +0100 Subject: [PATCH 4/4] changelog --- docs/changes/2091.api.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/changes/2091.api.md diff --git a/docs/changes/2091.api.md b/docs/changes/2091.api.md new file mode 100644 index 0000000000..778f6849c0 --- /dev/null +++ b/docs/changes/2091.api.md @@ -0,0 +1 @@ +Update command to run development container: **use bash -lc** (related to updates to git safedir).