Публикация номерной версии в докер

EvilBeaver · EvilBeaver · commit c7c8e6ba34cd · 2026-01-01T17:32:53.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -308,14 +308,19 @@ pipeline {
                         anyOf {
                             branch 'develop'
                             branch 'release/latest'
-                            expression { 
-                                return env.TAG_NAME && env.TAG_NAME.startsWith('v2.')
-                            }
                         }
                     }
                     steps {
                         script {
-                            def codename = env.TAG_NAME ? env.TAG_NAME : 'dev'
+                            def codename = ''
+                            if (env.VersionSuffix != null && !env.VersionSuffix.isEmpty() {
+                                codename = 'dev'
+                            }
+                            else
+                            {
+                                codename = fullVersionNumber()
+                            }
+                            
                             publishDockerImage('v2', codename)
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -308,14 +308,19 @@ pipeline {`
`308`	`308`	`anyOf {`
`309`	`309`	`branch 'develop'`
`310`	`310`	`branch 'release/latest'`
`311`		`- expression {`
`312`		`- return env.TAG_NAME && env.TAG_NAME.startsWith('v2.')`
`313`		`- }`
`314`	`311`	`}`
`315`	`312`	`}`
`316`	`313`	`steps {`
`317`	`314`	`script {`
`318`		`- def codename = env.TAG_NAME ? env.TAG_NAME : 'dev'`
	`315`	`+ def codename = ''`
	`316`	`+ if (env.VersionSuffix != null && !env.VersionSuffix.isEmpty() {`
	`317`	`+ codename = 'dev'`
	`318`	`+ }`
	`319`	`+ else`
	`320`	`+ {`
	`321`	`+ codename = fullVersionNumber()`
	`322`	`+ }`
	`323`	`+`
`319`	`324`	`publishDockerImage('v2', codename)`
`320`	`325`	`}`
`321`	`326`	`}`