X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-cpupooler.git;a=blobdiff_plain;f=docker-build%2Fprocess-starter%2FDockerfile;fp=docker-build%2Fprocess-starter%2FDockerfile;h=bcb1e0c6848f507c83eeacace07b3a2a00a35cff;hp=2f474e1413f397d04e9baf5b79adc9bdf9638186;hb=491cc9200405931de807234cb0dc299bff76e3ea;hpb=6554d269f0133bc0efa7841c17ad5454755bcec0 diff --git a/docker-build/process-starter/Dockerfile b/docker-build/process-starter/Dockerfile index 2f474e1..bcb1e0c 100644 --- a/docker-build/process-starter/Dockerfile +++ b/docker-build/process-starter/Dockerfile @@ -20,6 +20,7 @@ ENV DEP_VERSION=$DEPENDENCY_MANAGER ARG CPUPOOLER ENV CPUPOOLER_VERSION=$CPUPOOLER ENV GOPATH /build +ENV BUILD_DIR="$GOPATH/src/github.com/nokia/CPU-Pooler" RUN yum update -y \ && yum install -y \ @@ -42,13 +43,13 @@ RUN yum update -y \ && yum install -y golang \ && curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v${DEP_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 \ -&& cd $GOPATH/src/github.com/nokia/CPU-Pooler \ +&& mkdir -p $BUILD_DIR \ +&& git clone https://github.com/Levovar/CPU-Pooler.git $BUILD_DIR \ +&& cd $BUILD_DIR \ +&& 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 - - +&& mv $BUILD_DIR/process-starter /process-starter \ +&& rm -rf $GOPATH