From 428c099f02ec93a3365b451fa19caa7a76a073aa Mon Sep 17 00:00:00 2001 From: Sofiia Churikova Date: Fri, 2 May 2025 04:00:49 +0300 Subject: [PATCH] Update Jenkinsfile --- Jenkinsfile | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0b18fe86..f635d7f2c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,17 +45,11 @@ pipeline { stage('Create Docker Image') { steps { script { - sh 'sudo chmod 666 /var/run/docker.sock || true' - def shortCommit = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim() - sh "docker build -f Dockerfile.multi -t host.docker.internal:8084/mr:${shortCommit} ." - - withCredentials([usernamePassword(credentialsId: 'nexus-credentials', - usernameVariable: 'NEXUS_USERNAME', - passwordVariable: 'NEXUS_PASSWORD')]) { - sh "echo \${NEXUS_PASSWORD} | docker login host.docker.internal:8084 -u \${NEXUS_USERNAME} --password-stdin" - sh "docker push host.docker.internal:8084/mr:${shortCommit}" + docker.withRegistry("http://${env.NEXUS_SERVER}:${env.NEXUS_PORT_MR}", 'nexus-credentials') { + def customImage = docker.build("${env.NEXUS_SERVER}:${env.NEXUS_PORT_MR}/${env.NEXUS_REPO_MR}:${shortCommit}", "-f Dockerfile.multi .") + customImage.push() } } } @@ -82,17 +76,11 @@ pipeline { stage('Create Docker Image') { steps { script { - sh 'sudo chmod 666 /var/run/docker.sock || true' - def shortCommit = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim() - sh "docker build -f Dockerfile.multi -t host.docker.internal:8083/main:${shortCommit} ." - - withCredentials([usernamePassword(credentialsId: 'nexus-credentials', - usernameVariable: 'NEXUS_USERNAME', - passwordVariable: 'NEXUS_PASSWORD')]) { - sh "echo \${NEXUS_PASSWORD} | docker login host.docker.internal:8083 -u \${NEXUS_USERNAME} --password-stdin" - sh "docker push host.docker.internal:8083/main:${shortCommit}" + docker.withRegistry("http://${env.NEXUS_SERVER}:${env.NEXUS_PORT_MAIN}", 'nexus-credentials') { + def customImage = docker.build("${env.NEXUS_SERVER}:${env.NEXUS_PORT_MAIN}/${env.NEXUS_REPO_MAIN}:${shortCommit}", "-f Dockerfile.multi .") + customImage.push() } } }