Go version update to 1.12.9

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

diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec
index 47119f8..4a86c64 100644 (file)
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@ -15,7 +15,8 @@
 %define COMPONENT chartrepo
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 8
+%define RPM_MINOR_VERSION 9
+%define go_version 1.12.9
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
@@ -51,6 +52,7 @@ docker build \
   --build-arg http_proxy="${http_proxy}" \
   --build-arg https_proxy="${https_proxy}" \
   --build-arg no_proxy="${no_proxy}" \
+  --build-arg go_version="%{go_version}" \
   --tag %{COMPONENT}:%{IMAGE_TAG} \
   %{docker_build_dir}/chartrepohandler
 mkdir -p %{docker_save_dir}

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index e2f7f34..a6122fa 100644 (file)
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -15,10 +15,9 @@
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.14.3
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
-%define go_version 1.11.5
-%define cni_plugins_version 0.7.0
+%define go_version 1.12.9
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save

diff --git a/docker-build/chartrepohandler/Dockerfile b/docker-build/chartrepohandler/Dockerfile
index db99275..9c3627e 100644 (file)
--- a/docker-build/chartrepohandler/Dockerfile
+++ b/docker-build/chartrepohandler/Dockerfile
@@ -18,11 +18,19 @@ MAINTAINER Krisztian Lengyel <krisztian.lengyel@nokia.com>
 COPY mainstart.sh /usr/bin/mainstart.sh
 COPY chart-repo-handler /chart-repo-handler
 ENV GOPATH /build
+ARG go_install_dir="/usr/local/go"
+ARG go_version
+ENV PATH="$go_install_dir/bin:$PATH"
+
 
 # TODO remake build
 RUN adduser -u 150 -D -H chartrepo \
-&& apk add --no-cache --virtual .build-deps go gcc g++ git glide \
+&& apk add --no-cache --virtual .build-deps go gcc g++ git glide bash \
 && apk add --no-cache curl \
+&& 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 \
 && mv /chart-repo-handler $GOPATH/src/chart-repo-handler \
 && cd $GOPATH/src/chart-repo-handler \
@@ -31,6 +39,7 @@ RUN adduser -u 150 -D -H chartrepo \
 && cp chart-repo-handler /usr/bin/chart-repo-handler \
 && rm -rf $GOPATH \
 && apk del .build-deps \
+&& rm -rf $go_install_dir \
 && rm -rf /root/.glide \
 && chown -R chartrepo /usr/bin/mainstart.sh \
 && chmod +x /usr/bin/mainstart.sh

diff --git a/docker-build/helm-builder/Dockerfile b/docker-build/helm-builder/Dockerfile
index 2b1ff95..7f1caaa 100644 (file)
--- a/docker-build/helm-builder/Dockerfile
+++ b/docker-build/helm-builder/Dockerfile
@@ -40,5 +40,6 @@ RUN yum install -y --setopt=skip_missing_names_on_install=False \
 &&  mv ./_dist/linux-amd64/tiller ${binaries}/ \
 &&  mv ./_dist/linux-amd64/helm ${binaries}/ \
 &&  rm -rf $GOPATH \
+&&  rm -rf $go_install_dir \
 &&  rm -rf /build \
 &&  rm -rf /root/.glide