X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Fprocess-starter%2FDockerfile;h=0dbc5f942594048dee0bf20f740885cc4fb9e915;hb=1c00762f8f3a78c0d6bd5ca177018effdbe10ca3;hp=2f474e1413f397d04e9baf5b79adc9bdf9638186;hpb=615d289d61440f17b130a351510d1a2adcf40b80;p=ta%2Fcaas-cpupooler.git

diff --git a/docker-build/process-starter/Dockerfile b/docker-build/process-starter/Dockerfile
index 2f474e1..0dbc5f9 100644
--- a/docker-build/process-starter/Dockerfile
+++ b/docker-build/process-starter/Dockerfile
@@ -15,15 +15,16 @@
 FROM centos:7.6.1810
 MAINTAINER Balazs Szekeres <balazs.szekeres@nokia.com>
 
-ARG DEPENDENCY_MANAGER
-ENV DEP_VERSION=$DEPENDENCY_MANAGER
-ARG CPUPOOLER
-ENV CPUPOOLER_VERSION=$CPUPOOLER
+ARG DEP_MAN_VERSION
+ARG go_install_dir="/usr/local/go"
+ARG go_version
+ENV GOBIN=/usr/local/bin
 ENV GOPATH /build
+ENV PATH="$GOPATH/bin:$go_install_dir/bin:$PATH"
+ARG CPUPOOLER_VERSION
 
 RUN yum update -y \
 &&  yum install -y \
-      go \
       git \
       bash \
       glide \
@@ -37,18 +38,18 @@ RUN yum update -y \
       make \
       gcc \
       gcc-c++ \
-&&  rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO \
-&&  curl -s https://mirror.go-repo.io/centos/go-repo.repo | tee /etc/yum.repos.d/go-repo.repo \
-&&  yum install -y golang \
-&&  curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 \
+&&  mkdir -p $go_install_dir \
+&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&&  curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_MAN_VERSION}/dep-linux-amd64 \
 &&  chmod +x /usr/local/bin/dep \
 &&  mkdir -p $GOPATH/src/github.com/nokia/CPU-Pooler \
-&&  curl -fsSL -k https://github.com/nokia/CPU-Pooler/archive/v${CPUPOOLER_VERSION}.tar.gz | tar zx --strip-components=1 -C $GOPATH/src/github.com/nokia/CPU-Pooler \
+&&  git clone https://github.com/nokia/CPU-Pooler.git $GOPATH/src/github.com/nokia/CPU-Pooler \
 &&  cd $GOPATH/src/github.com/nokia/CPU-Pooler \
+&&  git fetch --tags \
+&&  git checkout ${CPUPOOLER_VERSION} \
 &&  dep ensure --vendor-only \
 # process-starter
 &&  CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o process-starter ./cmd/process-starter \
 &&  mv $GOPATH/src/github.com/nokia/CPU-Pooler/process-starter /process-starter \
-&&  rm -rf $GOPATH 
-
-
+&&  rm -rf $go_install_dir \
+&&  rm -rf $GOPATH