Escalating and building/publishing in maas
diff --git a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
index 2e1a581..6508123 100644
--- a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerPublishRule.groovy
@@ -39,7 +39,10 @@
if (taskName.startsWith('publish')) {
project.task(taskName, type: DockerPushTask) {
ext.compName = taskName - 'publish'
- dependsOn "tag" + compName
+ println "Publish rule: $taskName + $compName"
+ def tagTask = "tag$compName"
+ println "Tagtask: $tagTask"
+ dependsOn tagTask
def spec = project.comps[ext.compName]
repositoryName = spec.name + ':' + project.targetTag
registry = project.targetReg
diff --git a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
index b48cfb5..70fd03e 100644
--- a/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
+++ b/buildSrc/src/main/groovy/org/opencord/build/rules/DockerTagRule.groovy
@@ -36,11 +36,10 @@
}
void apply(String taskName) {
- if (taskName.startsWith('tag')) {
+ if (taskName.startsWith('tag') && !taskName.equals('tag')) {
project.task(taskName, type: DockerTagTask) {
ext.compName = taskName - 'tag'
- dependsOn "fetch" + compName
- def spec = project.comps[ext.compName]
+ def spec = project.comps[compName]
imageId = spec.name + '@' + spec.digest
tag = compName + ':' + project.targetTag
}