konsthol/my-jenkins-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Can someone review this commit, please ?

Browse Source
This commit is contained in:
konsthol
2025-05-27 12:18:08 +03:00
parent d980c2a3c6
commit f1fe3e5cbb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vars/buildAndDeploy.groovy
View File

@@ -2,6 +2,7 @@ import com.example.DockerBuilder
def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker) { def call(String appName, String helmChartPath, String helmRepoName,String helmChartVersion, Boolean useCustomDocker) {
def dockerBuilder = new DockerBuilder() def dockerBuilder = new DockerBuilder()
def containerName = useCustomDocker ? 'custom-docker' : 'docker'
stage('Make jar') { stage('Make jar') {
script { script {
@@ -19,11 +20,9 @@ def call(String appName, String helmChartPath, String helmRepoName,String helmCh
} }
} }
stage('Docker build & push') { stage('Docker build & push') {
script { container(containerName) {
if (useCustomDocker) { script {
dockerBuilder.customDockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS) dockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS, useCustomDocker)
} else {
dockerBuilder.dockerBuildAndPush(env.NEXUS_DOCKER_URL, appName, "./Dockerfile", "target", "admin", env.NEXUS_DOCKER_PASS)
} }
} }
} }