From b9d1e0ef1090be2d79f9309fdf7c3d7abe178fb3 Mon Sep 17 00:00:00 2001 From: Trevor Gibson Date: Tue, 7 Feb 2023 15:56:38 -0800 Subject: [PATCH 1/3] Forward .gitconfig into Docker container --- industrial_ci/src/isolation/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/industrial_ci/src/isolation/docker.sh b/industrial_ci/src/isolation/docker.sh index e354316d1..b355e0d66 100644 --- a/industrial_ci/src/isolation/docker.sh +++ b/industrial_ci/src/isolation/docker.sh @@ -94,6 +94,7 @@ function ici_isolate() { ici_forward_mount CCACHE_DIR rw ici_forward_mount SSH_AUTH_SOCK rw # forward ssh agent into docker container ici_forward_mount GITHUB_OUTPUT rw # for ici_report_result in GitHub Actions + ici_forward_mount /home/runner/.gitconfig rw # forward custom mappings for multiple private repos in GitHub Actions local run_opts ici_parse_env_array run_opts DOCKER_RUN_OPTS From 8ccc0fe4ff2986911a883b71bbd4c8f83c55323e Mon Sep 17 00:00:00 2001 From: Trevor Gibson Date: Tue, 7 Feb 2023 16:10:46 -0800 Subject: [PATCH 2/3] Also forward .ssh directory to /home/runner --- industrial_ci/src/isolation/docker.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/industrial_ci/src/isolation/docker.sh b/industrial_ci/src/isolation/docker.sh index b355e0d66..7a32cb5ab 100644 --- a/industrial_ci/src/isolation/docker.sh +++ b/industrial_ci/src/isolation/docker.sh @@ -94,7 +94,10 @@ function ici_isolate() { ici_forward_mount CCACHE_DIR rw ici_forward_mount SSH_AUTH_SOCK rw # forward ssh agent into docker container ici_forward_mount GITHUB_OUTPUT rw # for ici_report_result in GitHub Actions - ici_forward_mount /home/runner/.gitconfig rw # forward custom mappings for multiple private repos in GitHub Actions + + # For GitHub Actions, forward ssh key mappings for multiple github deploy keys generated by webfactory/ssh-agent + ici_forward_mount /home/runner/.gitconfig rw + ici_forward_mount /home/runner/.ssh rw local run_opts ici_parse_env_array run_opts DOCKER_RUN_OPTS From 40108625e9fb36c2afa271a1436ba6a410f996de Mon Sep 17 00:00:00 2001 From: Trevor Gibson Date: Tue, 7 Feb 2023 16:30:19 -0800 Subject: [PATCH 3/3] Remove extra whitespace --- industrial_ci/src/isolation/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/industrial_ci/src/isolation/docker.sh b/industrial_ci/src/isolation/docker.sh index 7a32cb5ab..1ccd2bd98 100644 --- a/industrial_ci/src/isolation/docker.sh +++ b/industrial_ci/src/isolation/docker.sh @@ -94,7 +94,7 @@ function ici_isolate() { ici_forward_mount CCACHE_DIR rw ici_forward_mount SSH_AUTH_SOCK rw # forward ssh agent into docker container ici_forward_mount GITHUB_OUTPUT rw # for ici_report_result in GitHub Actions - + # For GitHub Actions, forward ssh key mappings for multiple github deploy keys generated by webfactory/ssh-agent ici_forward_mount /home/runner/.gitconfig rw ici_forward_mount /home/runner/.ssh rw