diff --git a/src/com/example/DockerBuilder.groovy b/src/com/example/DockerBuilder.groovy index 5f7efcd..300d5ad 100644 --- a/src/com/example/DockerBuilder.groovy +++ b/src/com/example/DockerBuilder.groovy @@ -10,6 +10,6 @@ class DockerBuilder { "docker login http://${dockerRepo} -u ${nexusUser} -p ${nexusPass}", "docker tag ${imageName} ${dockerRepo}/my-docker-repo/${imageName}:latest", "docker push ${dockerRepo}/my-docker-repo/${imageName}:latest" - ].collect { it.toString() } + ] } } diff --git a/vars/buildAndDeploy.groovy b/vars/buildAndDeploy.groovy index 39c5ed2..b5eafdb 100644 --- a/vars/buildAndDeploy.groovy +++ b/vars/buildAndDeploy.groovy @@ -22,8 +22,8 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh stage('Docker build & push') { container(containerName) { script { - sh dockerBuilder.getDockerdCommand(env.NEXUS_DOCKER_URL, useInsecureRegistry) - sh dockerBuilder.getDockerBuildCommands( + sh(script: dockerBuilder.getDockerdCommand(env.NEXUS_DOCKER_URL, useInsecureRegistry), returnStdout: true) + dockerBuilder.getDockerBuildCommands( env.NEXUS_DOCKER_URL, appName, "./Dockerfile",