From 72812802377468119b89aaafa9faf5bac8af3bbf Mon Sep 17 00:00:00 2001
From: Simon Dudley <simon.l.dudley@hotmail.com>
Date: Wed, 15 Sep 2021 08:30:31 +0100
Subject: [PATCH] Publish to consensys/ethsigner docker namespace and tidy up
 old config (#385)

Remove pegasyseng docker tag and push config
Add publishing to docker namespace "consensys/ethsigner"
Deprecate docker namespace "consensys/quorum-ethsigner"

Fixes https://github.com/ConsenSys/ethsigner/issues/384
---
 CHANGELOG.md |  7 +++++++
 build.gradle | 14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3477efcbc..073c5bde4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## ...Next Version...
+
+### Features Added
+
+- Add publishing to docker namespace "consensys/ethsigner"
+- Deprecating docker namespace "consensys/quorum-ethsigner"
+
 ## 21.3.2
 
 ### Bugs Fixed
diff --git a/build.gradle b/build.gradle
index 6714d918a..aa1afc848 100644
--- a/build.gradle
+++ b/build.gradle
@@ -469,7 +469,7 @@ tasks.register("dockerDistUntar") {
 task distDocker(type: Exec) {
   dependsOn dockerDistUntar
   def dockerBuildVersion = project.hasProperty('release.releaseVersion') ? project.property('release.releaseVersion') : "${rootProject.version}"
-  def imageName = "consensys/quorum-" + repositoryName
+  def imageName = "consensys/" + repositoryName
   def image = project.hasProperty('release.releaseVersion') ? "${imageName}:" + project.property('release.releaseVersion') : "${imageName}:${project.version}"
   def dockerBuildDir = "build/docker-" + repositoryName + "/"
   workingDir "${dockerBuildDir}"
@@ -488,7 +488,7 @@ task distDocker(type: Exec) {
 task testDocker(type: Exec) {
   dependsOn distDocker
   def dockerReportsDir = "docker/reports/"
-  def imageName = "consensys/quorum-" + repositoryName
+  def imageName = "consensys/" + repositoryName
   def image = project.hasProperty('release.releaseVersion') ? "${imageName}:" + project.property('release.releaseVersion') : "${imageName}:${project.version}"
   workingDir "docker"
 
@@ -502,13 +502,13 @@ task testDocker(type: Exec) {
 
 task dockerUpload(type: Exec) {
   dependsOn distDocker
-  def imageName = "consensys/quorum-" + repositoryName
+  def imageName = "consensys/" + repositoryName
   def image = project.hasProperty('release.releaseVersion') ? "${imageName}:" + project.property('release.releaseVersion') : "${imageName}:${project.version}"
   def cmd = "docker push '${image}'"
 
-  def psImageName = "pegasyseng/" + repositoryName
-  def psImage = project.hasProperty('release.releaseVersion') ? "${psImageName}:" + project.property('release.releaseVersion') : "${psImageName}:${project.version}"
-  cmd += " && docker tag '${image}' '${psImage}' && docker push '${psImage}'"
+  def deprecatedQuorumImageName = "consensys/quorum-" + repositoryName
+  def deprecatedQuorumImage = project.hasProperty('release.releaseVersion') ? "${deprecatedQuorumImageName}:" + project.property('release.releaseVersion') : "${deprecatedQuorumImageName}:${project.version}"
+  cmd += " && docker tag '${image}' '${deprecatedQuorumImage}' && docker push '${deprecatedQuorumImage}'"
 
   def additionalTags = []
 
@@ -522,7 +522,7 @@ task dockerUpload(type: Exec) {
   }
 
   additionalTags.each { tag -> cmd += " && docker tag '${image}' '${imageName}:${tag.trim()}' && docker push '${imageName}:${tag.trim()}'" }
-  additionalTags.each { tag -> cmd += " && docker tag '${image}' '${psImageName}:${tag.trim()}' && docker push '${psImageName}:${tag.trim()}'" }
+  additionalTags.each { tag -> cmd += " && docker tag '${image}' '${deprecatedQuorumImageName}:${tag.trim()}' && docker push '${deprecatedQuorumImageName}:${tag.trim()}'" }
   executable "sh"
   args "-c", cmd
 }