Add awslabs to git safe dir (#802)

* Add awslabs to git safe dir * SHA in makefile & comments
awslabs · May 2, 2024 · cce9343 · cce9343
1 parent 4cd9db6
commit cce9343
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ WINDOWS_ARM64_BINARY=$(BINPATH)/windows-arm64/$(BINARY_NAME).exe
 .PHONY: docker
 docker: build-in-docker
 
-%-in-docker:
+%-in-docker: GITCOMMIT_SHA
 	docker run --rm \
 		--user $(UID):$(GID) \
 		--env TARGET_GOOS=$(TARGET_GOOS) \

diff --git a/scripts/container_init.sh b/scripts/container_init.sh
@@ -27,4 +27,7 @@ apk add --no-cache \
 # Resolves permission issues for Go cache when
 # building credential helper as non-root user.
 mkdir /.cache && chmod 777 /.cache
+# Resolves dubious ownership of git directory when
+# building credential helper as root user.
+git config --global --add safe.directory /go/src/github.com/awslabs/amazon-ecr-credential-helper