From 61ac2d9960b9f7541138ee53803dcc8042429a8c Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 3 Nov 2024 09:10:54 -0500 Subject: [PATCH 1/2] flake.nix: make sure git dubitious permission error vanishes with docker image using /root .gitconfig considering all dirs as safe dir Signed-off-by: Thierry Laurion --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 3ae2de90..bee186b0 100644 --- a/flake.nix +++ b/flake.nix @@ -139,15 +139,17 @@ -e ACLOCAL_PATH \ ${self.devShell.${system}} >/devenv.sh - # Git configuration for safe directory access. - printf '[safe]\n\tdirectory = *\n' >/.gitconfig mkdir /tmp; # Temporary directory for various operations. + chmod 1777 /tmp # Ensure /etc/passwd and /etc/group exist with root entries echo "root:x:0:0:root:/root:/bin/bash" > /etc/passwd echo "root:x:0:" > /etc/group mkdir -p /root chmod 700 /root + + # Git configuration for safe directory access. + echo -e '[safe]\n\tdirectory = *\n' > /root/.gitconfig ''; }; }); From 9f735e2238073955384a244ac9d1d484bd38f9c2 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 3 Nov 2024 09:13:12 -0500 Subject: [PATCH 2/2] Bump nix develop based docker image to tlaurion/heads-dev-env:v0.2.4 Signed-off-by: Thierry Laurion --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26917a2d..2214f1e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,7 @@ commands: jobs: prep_env: docker: - - image: tlaurion/heads-dev-env:v0.2.3 + - image: tlaurion/heads-dev-env:v0.2.4 resource_class: large working_directory: ~/heads steps: @@ -115,7 +115,7 @@ jobs: build_and_persist: docker: - - image: tlaurion/heads-dev-env:v0.2.3 + - image: tlaurion/heads-dev-env:v0.2.4 resource_class: large working_directory: ~/heads parameters: @@ -143,7 +143,7 @@ jobs: build: docker: - - image: tlaurion/heads-dev-env:v0.2.3 + - image: tlaurion/heads-dev-env:v0.2.4 resource_class: large working_directory: ~/heads parameters: @@ -164,7 +164,7 @@ jobs: save_cache: docker: - - image: tlaurion/heads-dev-env:v0.2.3 + - image: tlaurion/heads-dev-env:v0.2.4 resource_class: large working_directory: ~/heads steps: