Merge branch 'master' into development

gkirok · web-flow · commit 42b70e0b1d12 · 2020-07-13T14:00:05.000+03:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -24,14 +24,12 @@ podTemplate(label: "${git_project}-${label}", inheritFrom: "jnlp-docker-golang")
                             }
                         }
                     }
-
                     stage('push') {
                         container('docker-cmd') {
                             dockerx.images_push_multi_registries(["${git_project}:${github.DOCKER_TAG_VERSION}"], [pipelinex.DockerRepo.ARTIFACTORY_IGUAZIO, pipelinex.DockerRepo.DOCKER_HUB, pipelinex.DockerRepo.QUAY_IO, pipelinex.DockerRepo.GCR_IO])
                         }
                     }
                 }
-
                 github.pr(git_deploy_user, git_project, git_project_user, git_project_upstream_user, true, GIT_TOKEN) {
                     stage("build ${git_project} in dood") {
                         container('golang') {
diff --git a/Makefile b/Makefile
@@ -61,6 +61,6 @@ test:
 
 .PHONY: ensure-gopath
 ensure-gopath:
-ifndef GOPATH
-	$(error GOPATH must be set)
-endif
+	ifndef GOPATH
+		$(error GOPATH must be set)
+	endif
diff --git a/README.md b/README.md
@@ -1,2 +1,3 @@
 # locator
 Kubernetes local service locator
+

Original file line number	Diff line number	Diff line change
`@@ -24,14 +24,12 @@ podTemplate(label: "${git_project}-${label}", inheritFrom: "jnlp-docker-golang")`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-`
`28`	`27`	`stage('push') {`
`29`	`28`	`container('docker-cmd') {`
`30`	`29`	`dockerx.images_push_multi_registries(["${git_project}:${github.DOCKER_TAG_VERSION}"], [pipelinex.DockerRepo.ARTIFACTORY_IGUAZIO, pipelinex.DockerRepo.DOCKER_HUB, pipelinex.DockerRepo.QUAY_IO, pipelinex.DockerRepo.GCR_IO])`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`	`}`
`34`		`-`
`35`	`33`	`github.pr(git_deploy_user, git_project, git_project_user, git_project_upstream_user, true, GIT_TOKEN) {`
`36`	`34`	`stage("build ${git_project} in dood") {`
`37`	`35`	`container('golang') {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`# locator`
`2`	`2`	`Kubernetes local service locator`
	`3`	`+`