From c3fe93c35482487a0ab174b62b5a4d71edf607cc Mon Sep 17 00:00:00 2001 From: Siyuan Miao Date: Thu, 25 Sep 2025 22:37:42 +0000 Subject: [PATCH] entrypoint script --- Dockerfile.build | 7 ++++++- scripts/build_utils.sh | 6 ++++++ scripts/ci_helper.sh | 2 -- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Dockerfile.build b/Dockerfile.build index 81edd3da..db433b2d 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -16,4 +16,9 @@ COPY go.mod go.sum /build/ WORKDIR /build -RUN go mod download && go mod verify \ No newline at end of file +RUN go mod download && go mod verify + +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh + +ENTRYPOINT [ "/entrypoint.sh" ] \ No newline at end of file diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index dcd27c7d..fa000b26 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -45,6 +45,12 @@ function prepare_docker_build_context() { go.sum \ Dockerfile.build \ "${DOCKER_BUILD_CONTEXT_DIR}" + cat > "${DOCKER_BUILD_CONTEXT_DIR}/entrypoint.sh" << 'EOF' +#!/bin/bash +git config --global --add safe.directory /build +exec $@ +EOF + chmod +x "${DOCKER_BUILD_CONTEXT_DIR}/entrypoint.sh" } function build_docker_image() { diff --git a/scripts/ci_helper.sh b/scripts/ci_helper.sh index 23b381c6..60b89963 100755 --- a/scripts/ci_helper.sh +++ b/scripts/ci_helper.sh @@ -23,8 +23,6 @@ elif [ "$1" = "make" ]; then else DOCKER_GO_CACHE_DIR=$(go env GOCACHE) fi - # add /build to the safe directory list - git config --global --add safe.directory /build do_make "${@:2}" fi