Merge "Remove DANM TenantConfig creation"

[ta/caas-danm.git] / docker-build / sriovdp / Dockerfile

diff --git a/docker-build/sriovdp/Dockerfile b/docker-build/sriovdp/Dockerfile
index 7fc7b68..554c389 100644 (file)
--- a/docker-build/sriovdp/Dockerfile
+++ b/docker-build/sriovdp/Dockerfile
@@ -15,17 +15,24 @@
 FROM alpine:3.9
 MAINTAINER Levente Kale <levente.kale@nokia.com>
 
-ARG SRIOV
-ENV SRIOV_VERSION=$SRIOV
+ARG SRIOVDP
+ENV SRIOVDP_VERSION=$SRIOVDP
 ENV GOPATH /go
-ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+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
 
 WORKDIR /
 
-RUN apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide git \
+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${SRIOV_VERSION} \
+&& 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 \
@@ -33,12 +40,13 @@ RUN apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide gi
 && 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
 
-RUN chmod 700 /usr/local/bin/sriovdp 
+RUN chmod 700 /usr/local/bin/sriovdp
 
 LABEL io.k8s.display-name="SRIOV Network Device Plugin"
 ENTRYPOINT ["/usr/local/bin/sriovdp"]