Skip to content

Commit 74f7670

Browse files
committed
Перенос сборки в основной дженкинсфайл
1 parent e17fe9a commit 74f7670

File tree

2 files changed

+50
-59
lines changed

2 files changed

+50
-59
lines changed

Jenkinsfile

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ pipeline {
199199
}
200200

201201
stage ('Publishing night-build') {
202-
when { anyOf {
203-
branch 'develop';
202+
when {
203+
anyOf {
204+
branch 'develop';
204205
}
205206
}
206207
agent { label 'master' }
@@ -217,8 +218,9 @@ pipeline {
217218
}
218219

219220
stage ('Publishing preview') {
220-
when { anyOf {
221-
branch 'release/preview';
221+
when {
222+
anyOf {
223+
branch 'release/preview';
222224
}
223225
}
224226
agent { label 'master' }
@@ -257,6 +259,40 @@ pipeline {
257259
}
258260
}
259261
}
262+
263+
stage ('Publishing docker-images') {
264+
agent { label 'linux' }
265+
266+
parallel {
267+
stage('Build v1') {
268+
when {
269+
anyOf {
270+
branch 'latest'
271+
expression {
272+
return env.TAG_NAME && env.TAG_NAME.startsWith('v1.')
273+
}
274+
}
275+
}
276+
steps {
277+
publishDockerImage('v1')
278+
}
279+
}
280+
281+
stage('Build v2') {
282+
when {
283+
anyOf {
284+
branch 'develop'
285+
expression {
286+
return env.TAG_NAME && env.TAG_NAME.startsWith('v2.')
287+
}
288+
}
289+
}
290+
steps {
291+
publishDockerImage('v2')
292+
}
293+
}
294+
}
295+
}
260296
}
261297
}
262298

@@ -300,3 +336,13 @@ def publishReleaseNotes(codename) {
300336
}
301337
}
302338

339+
def publishDockerImage(flavour) {
340+
def dockerTag = env.TAG_NAME ? env.TAG_NAME : env.BRANCH_NAME
341+
def imageName = "evilbeaver/onescript:${dockerTag}"
342+
343+
docker.build(
344+
imageName,
345+
"--load -f install/builders/base-image/Dockerfile_${flavour} ."
346+
).push()
347+
}
348+

docker-build.Jenkinsfile

Lines changed: 0 additions & 55 deletions
This file was deleted.

0 commit comments

Comments
 (0)