From: Balazs Szekeres <balazs.szekeres@nokia.com>
Date: Fri, 30 Aug 2019 14:04:26 +0000 (+0200)
Subject: Go version update to 1.12.9
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-danm.git;a=commitdiff_plain;h=fad294cd24c9b15a223d4988d02c7a741b9b72fb

Go version update to 1.12.9

Change-Id: I48aff4be994d2647c7b897dfb21f7948f6f7c03f
Signed-off-by: Balazs Szekeres <balazs.szekeres@nokia.com>
---

diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec
index 5655a68..f2faa5f 100644
--- a/SPECS/caas-danm.spec
+++ b/SPECS/caas-danm.spec
@@ -15,10 +15,10 @@
 %define COMPONENT danm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.0.0
-%define RPM_MINOR_VERSION 3
+%define RPM_MINOR_VERSION 4
 %define DANM_VERSION 5e15d4e322fc5ff89b06ac70bd83b5ce4c09d0df
 %define CNI_VERSION 0.8.1
-%define go_version 1.12.1
+%define go_version 1.12.9
 %define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
diff --git a/SPECS/caas-hyperdanm.spec b/SPECS/caas-hyperdanm.spec
index cd5dfc8..a447ae3 100644
--- a/SPECS/caas-hyperdanm.spec
+++ b/SPECS/caas-hyperdanm.spec
@@ -15,9 +15,9 @@
 %define COMPONENT hyperdanm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 4.0.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define DANM_VERSION 5e15d4e322fc5ff89b06ac70bd83b5ce4c09d0df
-%define go_version 1.12.1
+%define go_version 1.12.9
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define danm_components netwatcher svcwatcher webhook
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
diff --git a/SPECS/caas-sriovdp.spec b/SPECS/caas-sriovdp.spec
index 3e0b554..62b3151 100644
--- a/SPECS/caas-sriovdp.spec
+++ b/SPECS/caas-sriovdp.spec
@@ -15,8 +15,9 @@
 %define COMPONENT sriovdp
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.0.0
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
+%define go_version 1.12.9
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
@@ -49,6 +50,7 @@ docker build \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
   --build-arg SRIOVDP="%{RPM_MAJOR_VERSION}" \
+  --build-arg go_version="%{go_version}" \
   --tag %{COMPONENT}:%{IMAGE_TAG} \
   %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/
 
diff --git a/docker-build/sriovdp/Dockerfile b/docker-build/sriovdp/Dockerfile
index e478e91..554c389 100644
--- a/docker-build/sriovdp/Dockerfile
+++ b/docker-build/sriovdp/Dockerfile
@@ -18,13 +18,19 @@ MAINTAINER Levente Kale <levente.kale@nokia.com>
 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 jq \
-&& apk add --no-cache --virtual .tools ca-certificates gcc musl-dev go glide git \
+&& 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 \
@@ -34,6 +40,7 @@ RUN apk add --no-cache jq \
 && 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/* \