Merge branch 'master' into development

v3io · Jul 13, 2020 · 42b70e0 · 42b70e0
2 parents aa12349 + ed0a4f6
commit 42b70e0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
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
+