| 
					
				 | 
			
			
				@@ -8,7 +8,7 @@ pipeline { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   environment { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     DOCKER_REGISTRY='dev-registry.infoclinica.ru:5000' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    DOCKER_IMAGE='ovpn' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    DOCKER_IMAGE='ovpn-rsa' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     SERVICE_NAME='ovpn_server' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     SERVICE_IMAGE='container_run' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     SWARM_GIT_URL='ssh://git@git.sdsys.ru:8022/iru/stack-deploy.git' 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -69,26 +69,6 @@ pipeline { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            """ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    stage("Staging") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      steps { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        echo "Run ${DOCKER_IMAGE} in server mode." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        sh """container_id_server=\$(docker run -d --rm -e "mode=server" --privileged ${DOCKER_REGISTRY}/iru/${DOCKER_IMAGE}:${SERIAL}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              container_ip_server=\$(docker inspect \${container_id_server} --format='{{.NetworkSettings.IPAddress}}') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              container_id_client=`docker run -d --rm -e "mode=client" -e "server=\${container_ip_server}" --privileged \${DOCKER_REGISTRY}/iru/\${DOCKER_IMAGE}:\${SERIAL}` 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              sleep 15 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              docker exec \${container_id_client} ping -c 3 -q 10.10.20.1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              if [ $? != 0 ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              then 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                echo "Can not connect to VPN server !!!" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                docker stop ${container_id_server} ${container_id_client} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                exit 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                echo "VPN server is started" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                docker stop ${container_id_server} ${container_id_client} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              fi 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-           """ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     stage ("Push to registry") { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       steps { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         script { 
			 |