diff --git a/Jenkinsfile b/Jenkinsfile index 7222992..a1b1f93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,26 +13,26 @@ pipeline { stage ('build bot image and push') { steps { - script { - docker.withRegistry("${REGISTRY_URL}", 'jenkins_harbor') { - def BotImage = docker.build( - "${REGISTRY_URL}/${BOT_IMAGE_NAME}:${BOT_IMAGE_TAG}" - "-f ./tunnel/Dockerfile.tunnel ." - ) - BotImage.push() + script { + docker.withRegistry("${REGISTRY_URL}", 'jenkins_harbor') { + def BotImage = docker.build( + "${REGISTRY_URL}/${BOT_IMAGE_NAME}:${BOT_IMAGE_TAG}" + ) + BotImage.push() + } } } } - } stage ('build tunnel image and push') { steps { - script { - docker.withRegistry("${REGISTRY_URL}", 'jenkins_harbor') { - def TunnelImage = docker.build( - "${REGISTRY}/${TUNNEL_IMAGE_NAME}:${TUNNEL_IMAGE_TAG}", - "-f ./tunnel/Dockerfile.tunnel ." - ) - TunnelImage.push() + dir('tunnel'){ + script { + docker.withRegistry("${REGISTRY_URL}", 'jenkins_harbor') { + def TunnelImage = docker.build( + "${REGISTRY}/${TUNNEL_IMAGE_NAME}:${TUNNEL_IMAGE_TAG}" + ) + TunnelImage.push() + } } } } @@ -64,6 +64,7 @@ pipeline { echo "Ошибка сборки!" } } + } } diff --git a/tunnel/Dockerfile.tunnel b/tunnel/Dockerfile similarity index 100% rename from tunnel/Dockerfile.tunnel rename to tunnel/Dockerfile