From cc5a9c8fda8032ebf15ae81c3dde209f466a038e Mon Sep 17 00:00:00 2001
From: gkirok <gkirok@gmail.com>
Date: Mon, 24 Dec 2018 22:37:59 +0200
Subject: [PATCH] merge pr (#10)

---
 Dockerfile.multi | 17 -----------------
 Jenkinsfile      |  2 +-
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 Dockerfile.multi

diff --git a/Dockerfile.multi b/Dockerfile.multi
deleted file mode 100644
index 4a6b0fa..0000000
--- a/Dockerfile.multi
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM golang:1.11 as builder
-ADD ./ /go/src/github.com/v3io/locator
-WORKDIR /go/src/github.com/v3io/locator
-RUN make bin
-
-FROM debian:stretch-slim
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends ca-certificates && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-EXPOSE 8080
-
-COPY --from=builder /go/src/github.com/v3io/locator/cmd/locatorctl /usr/local/bin/locatorctl
-
-CMD [ "locatorctl" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a4d2a7..2524afa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -81,7 +81,7 @@ spec:
                 stage("build ${git_project} in dood") {
                     container('docker-cmd') {
                         dir("${BUILD_FOLDER}/src/github.com/v3io/${git_project}") {
-                            sh("docker build . -f Dockerfile.multi --tag ${git_project}:${TAG_VERSION}")
+                            sh("docker build . -f Dockerfile --tag ${git_project}:${TAG_VERSION}")
                         }
                     }
                 }