From 907ebf12a4ac28d8388620f65b431918fa70c3e7 Mon Sep 17 00:00:00 2001
From: Carlos Fagiani Junior <fagianijunior@gmail.com>
Date: Fri, 4 Oct 2024 10:39:21 -0300
Subject: [PATCH] Update git version

---
 Dockerfile | 2 +-
 build.sh   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e55a4a7..f3d144b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ RUN set -ex \
 
 # Install Git
 RUN set -ex \
-   && GIT_VERSION=2.27.0 \
+   && GIT_VERSION=2.46.2 \
    && GIT_TAR_FILE=git-$GIT_VERSION.tar.gz \
    && GIT_SRC=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz  \
    && curl -L -o $GIT_TAR_FILE $GIT_SRC \
diff --git a/build.sh b/build.sh
index 741820f..f5d379b 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eo pipefail
+set -x
 
 VALID_ARGS=$(getopt -o i: --long image-name: -n 'build.sh' -- "$@")
 if [[ $? -ne 0 ]]; then
@@ -29,7 +30,7 @@ fi
 if [ $(DOCKER_CLI_EXPERIMENTAL=enabled docker manifest inspect $build_image_name 2> /dev/null ; echo $?) -eq 0 ]; then
 	echo "----> Skipping build as image already exists"
 else
-	build_builder_name=`grep builder project.toml | cut -d= -f2 | tr -d '" '`
+	build_builder_name=`grep builder ${REPO_SUB_FOLDER:+$REPO_SUB_FOLDER/}project.toml | cut -d= -f2 | tr -d '" '`
 	build_builder_tag=`echo $build_builder_name | tr /: -`
 	docker pull ${build_image_name%:*}:$build_builder_tag 2> /dev/null || true
 	docker tag ${build_image_name%:*}:$build_builder_tag $build_builder_name 2> /dev/null || true