add manual docker hub with commit hash publishing circleci step (Consensys#8213)

* add manual docker hub with commit hash publishing circleci step

Author: mehdi-aouadi

Diff for: .circleci/config.yml

@@ -143,12 +143,16 @@ commands:
 
   docker_publish_images:
     description: "Upload the docker images"
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     steps:
       - run:
           name: "Publish Docker Images"
           command: |
             docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
-            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH}" uploadDocker
+            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH} -PincludeCommitHash=<< parameters.include_commit_hash >>" uploadDocker
 
   notify:
     description: "Notify Slack"
@@ -431,23 +435,33 @@ jobs:
       - notify
 
   publishDockerAmd64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_amd64
     steps:
       - prepare
       - attach_workspace:
           at: ~/project
       - docker_trust_sign
-      - docker_publish_images
+      - docker_publish_images:
+          include_commit_hash: << parameters.include_commit_hash >>
       - notify
 
   publishDockerArm64:
+    parameters:
+      include_commit_hash:
+        type: boolean
+        default: false
     executor: machine_executor_arm64
     steps:
       - prepare
       - attach_workspace:
           at: ~/project
       - docker_trust_sign
-      - docker_publish_images
+      - docker_publish_images:
+          include_commit_hash: << parameters.include_commit_hash >>
       - notify
 
   manifestDocker:

Diff for: build.gradle

@@ -532,6 +532,16 @@ def executableAndArg = System.getProperty('os.name').toLowerCase().contains('win
 task distDocker  {
   dependsOn dockerDistUntar
   def dockerBuildVersion = 'develop'
+
+  if (project.hasProperty('includeCommitHash') && project.property('includeCommitHash').toBoolean()) {
+    def commitHash = new ByteArrayOutputStream()
+    exec {
+      commandLine 'git', 'rev-parse', '--short', 'HEAD'
+      standardOutput = commitHash
+    }
+    dockerBuildVersion += '-' + commitHash
+  }
+
   doLast {
     for (def variant in dockerJdkVariants) {
       copy {