Skip to content

Commit 3d9bb08

Browse files
authored
fix docker upload gradle task params (Consensys#8232)
1 parent 1ded471 commit 3d9bb08

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ commands:
148148
name: "Publish Docker Images"
149149
command: |
150150
docker login --username "${DOCKER_USER_RW}" --password "${DOCKER_PASSWORD_RW}"
151-
./gradlew --no-daemon --parallel "-Pbranch=${CIRCLE_BRANCH} -PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >>" uploadDocker
151+
./gradlew --no-daemon --parallel -Pbranch=${CIRCLE_BRANCH} -PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >> uploadDocker
152152
153153
notify:
154154
description: "Notify Slack"
@@ -464,7 +464,7 @@ jobs:
464464
- run:
465465
name: Create and publish docker manifest
466466
command: |
467-
./gradlew --no-daemon --parallel "-PincludeCommitHashInDockerTag=<< pipeline.parameters.include_commit_hash_in_docker_tag >>" manifestDocker
467+
./gradlew --no-daemon --parallel manifestDocker
468468
- notify
469469

470470
extractAPISpec:

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -633,10 +633,10 @@ task manifestDocker {
633633
}
634634

635635
for (def tag in tags) {
636-
platforms.forEach { platform -> cmd += "${tag}-${platform}${commitHashTag} " }
636+
platforms.forEach { platform -> cmd += "${tag}-${platform} " }
637637
exec {
638638
executable executableAndArg[0]
639-
args executableAndArg[1], "docker manifest create ${tag}${commitHashTag} ${cmd} && docker manifest push ${tag}${commitHashTag}"
639+
args executableAndArg[1], "docker manifest create ${tag} ${cmd} && docker manifest push ${tag}"
640640
}
641641
}
642642
}

0 commit comments

Comments
 (0)