fix docker upload gradle task params (Consensys#8232)

courtneyeh · Apr 20, 2024 · 3d9bb08 · 3d9bb08
1 parent 1ded471
commit 3d9bb08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -148,7 +148,7 @@ commands:
           name: "Publish Docker Images"
           command: |
             docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
-            ./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH} -PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >>" uploadDocker
+            ./gradlew --no-daemon --parallel -Pbranch=${CIRCLE_BRANCH} -PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >> uploadDocker
 
   notify:
     description: "Notify Slack"
@@ -464,7 +464,7 @@ jobs:
       - run:
           name: Create and publish docker manifest
           command: |
-            ./gradlew --no-daemon --parallel "-PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >>" manifestDocker
+            ./gradlew --no-daemon --parallel manifestDocker
       - notify
 
   extractAPISpec:

diff --git a/build.gradle b/build.gradle
@@ -633,10 +633,10 @@ task manifestDocker {
       }
 
       for (def tag in tags) {
-        platforms.forEach { platform -> cmd += "${tag}-${platform}${commitHashTag} " }
+        platforms.forEach { platform -> cmd += "${tag}-${platform} " }
         exec {
           executable executableAndArg[0]
-          args executableAndArg[1], "docker manifest create ${tag}${commitHashTag} ${cmd} && docker manifest push ${tag}${commitHashTag}"
+          args executableAndArg[1], "docker manifest create ${tag} ${cmd} && docker manifest push ${tag}"
         }
       }
     }