fix(build): docker git ref (hyperledger#6744)

Signed-off-by: Andrew Davis <1709934+Savid@users.noreply.github.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com> Signed-off-by: amsmota <antonio.mota@citi.com>
Citi · Apr 16, 2024 · 4b78c01 · 4b78c01
1 parent 4f06c7a
commit 4b78c01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -759,9 +759,10 @@ task distDocker {
           dockerPlatform = "--platform ${project.getProperty('docker-platform')}"
           println "Building for platform ${project.getProperty('docker-platform')}"
         }
+        def gitDetails = getGitCommitDetails(10)
         executable "sh"
         workingDir dockerBuildDir
-        args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ."
+        args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${gitDetails.hash} -t ${image} ."
       }
     }
 

diff --git a/ethereum/evmtool/build.gradle b/ethereum/evmtool/build.gradle
@@ -120,8 +120,9 @@ tasks.register('distDocker', Exec) {
     }
   }
 
+  def gitDetails = getGitCommitDetails(10)
   executable "sh"
-  args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ."
+  args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${gitDetails.hash} -t ${image} ."
 }
 
 tasks.register('dockerUpload', Exec) {