diff --git a/Jenkinsfile b/Jenkinsfile index 9fe9bc3..48a9ed8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,21 +8,31 @@ symfonyAppPipeline('ubuntu:22.04', [ 'hooks': [ // Run docker image build, verification and publication stages 'postSymfonyAppPipeline': { + stage('Build and publish docker images') { + steps { + make + make release + } + } stage('Build and publish hydra-dispatcher image') { // Retrieve current tag String currentTag = sh(script: 'git tag --points-at HEAD | head -n 1', returnStdout: true).trim() // Retrieve default tag String defaultTag = sh(returnStdout: true, script: 'git describe --always').trim() - job('Building docker images') { - steps { - shell('make') - } - } - job('Publishing docker images') { - steps { - shell('make release') - } - } + container.buildAndPublishImage([ + 'imageName': 'reg.cadoles.com/pcaseiro/myapplication-standalone', + // Use current tag or default tag if not defined + 'imageTag': defaultTag, + 'dockerfile': './misc/images/myapplication-standalone/Dockerfile', + 'dryRun': false + ]) + container.buildAndPublishImage([ + 'imageName': 'reg.cadoles.com/pcaseiro/myapplication-kube', + // Use current tag or default tag if not defined + 'imageTag': defaultTag, + 'dockerfile': './misc/images/myapplication-kube/Dockerfile', + 'dryRun': false + ]) } } ]