| 
					
				 | 
			
			
				@@ -4,6 +4,7 @@ pipeline { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   environment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     DOCKER_REGISTRY='dev-registry.infoclinica.ru:5000' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    BASE_REGISTRY='images.sdsys.ru' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     DOCKER_IMAGE='lab/admin-lab' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/labportal/stack-deploy.git' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     SWARM_GIT_NAME='stack-deploy' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -37,12 +38,15 @@ pipeline { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   stages { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     stage("Build") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       steps { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        echo "Building ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         script { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           NEWTAG = sh script: "docker run --rm --entrypoint=\"\" ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           echo "NEWTAG is $NEWTAG" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          withCredentials([usernamePassword(credentialsId: 'registry', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            echo "Building ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER}." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            sh "docker login -u ${USERNAME} -p ${PASSWORD} ${BASE_REGISTRY}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            sh "docker build --build-arg repo=${repo} --build-arg version=${version} --no-cache -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          NEWTAG = sh script: "docker run --rm --entrypoint=\"\" ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} rpm -q --qf %{VERSION}-%{RELEASE} ${PACKAGE_NAME} 2> /dev/null", returnStdout: true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          NEWTAG = repo + "-" + NEWTAG + "_" + BUILD_NUMBER 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          echo "NEWTAG is $NEWTAG" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         sh "docker tag ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${repo}-${BUILD_NUMBER} ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${NEWTAG}" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 |