X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=blobdiff_plain;f=docker-build%2Fsriovdp%2FDockerfile;fp=docker-build%2Fsriovdp%2FDockerfile;h=65a54a6e6b5e1327fdfc2efbade364757f6b733b;hp=554c38926771264f6633b92fbab273d7287cf170;hb=a7fdbdf37816d2beced1bbe1cd6f2b24c207980f;hpb=0ce09836dc2f68295a16e48753863bd6a1164879

diff --git a/docker-build/sriovdp/Dockerfile b/docker-build/sriovdp/Dockerfile
index 554c389..65a54a6 100644
--- a/docker-build/sriovdp/Dockerfile
+++ b/docker-build/sriovdp/Dockerfile
@@ -1,52 +1,42 @@
 # Copyright 2019 Nokia
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:3.9
-MAINTAINER Levente Kale <levente.kale@nokia.com>
+ARG go_version
+FROM golang:${go_version}-alpine3.9 as builder
+MAINTAINER Ferenc Toth <ferenc.2.toth@nokia.com>
 
 ARG SRIOVDP
-ENV SRIOVDP_VERSION=$SRIOVDP
-ENV GOPATH /go
-ARG go_install_dir="/usr/local/go"
-ARG go_version
-ENV PATH $GOPATH/bin:$go_install_dir/bin:/usr/local/go/bin:$PATH
-ENV GOOS=linux
+ARG SRIOVDP_HASH=""
 
-WORKDIR /
+RUN apk add --no-cache gcc musl-dev git curl tar linux-headers \
+&& mkdir -p $GOPATH/src/github.com/intel/sriov-network-device-plugin \
+&& cd $GOPATH/src/github.com/intel \
+&& if [ -n "$SRIOVDP_HASH" ]; then \
+     git clone https://github.com/intel/sriov-network-device-plugin.git \
+&&   cd sriov-network-device-plugin \
+&&   git checkout $SRIOVDP_HASH; \
+   else \
+     curl -fsSL https://github.com/intel/sriov-network-device-plugin/archive/v${SRIOVDP}.tar.gz | tar xz --strip-components=1 -C sriov-network-device-plugin; \
+   fi \
+&& go install -a -ldflags '-extldflags "-static"' github.com/intel/sriov-network-device-plugin/cmd/sriovdp
 
-RUN apk add --no-cache jq \
-&& apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide git bash curl tar \
-&& mkdir -p $go_install_dir \
-&& curl -fsSL -k https://dl.google.com/go/go${go_version}.src.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
-&& cd ${go_install_dir}/src/ \
-&& ./make.bash \
-&& mkdir -p $GOPATH/src/github.com/intel \
-&& git clone https://github.com/intel/sriov-network-device-plugin.git $GOPATH/src/github.com/intel/sriov-network-device-plugin --branch=v${SRIOVDP_VERSION} \
-&& cd $GOPATH/src/github.com/intel/sriov-network-device-plugin \
-&& glide --quiet install -v \
-&& go install -a -ldflags '-extldflags "-static"' github.com/intel/sriov-network-device-plugin/cmd/sriovdp \
-&& cp $GOPATH/bin/sriovdp /usr/local/bin/sriovdp \
-&& rm -rf $GOPATH/src \
-&& rm -rf $GOPATH/bin \
-&& apk del .tools \
-&& rm -rf $go_install_dir \
-&& rm -rf /var/cache/apk/* \
-&& rm -rf /var/lib/apt/lists/* \
-&& rm -rf /tmp/* \
-&& rm -rf ~/.glide
+FROM alpine:3.9
+RUN apk add --no-cache hwdata-pci jq
 
+COPY --from=builder /go/bin/sriovdp /usr/local/bin/
 RUN chmod 700 /usr/local/bin/sriovdp
 
+WORKDIR /
 LABEL io.k8s.display-name="SRIOV Network Device Plugin"
 ENTRYPOINT ["/usr/local/bin/sriovdp"]