X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=rpmbuild.spec;h=70d310aca9f10974372f92acfcecd8939fb64680;hb=refs%2Fchanges%2F59%2F1759%2F1;hp=f6f9af0015b876b089ecc55807fe6000ad98a2df;hpb=006abaa59c587ddeec59365e939b64ddb843e27d;p=ta%2Fcaas-kubedns.git diff --git a/rpmbuild.spec b/rpmbuild.spec index f6f9af0..70d310a 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -14,9 +14,10 @@ %define COMPONENT kubedns %define RPM_NAME caas-%{COMPONENT} -%define RPM_MAJOR_VERSION 1.15.2 -%define RPM_MINOR_VERSION 1 +%define RPM_MAJOR_VERSION 1.15.4 +%define RPM_MINOR_VERSION 5 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} +%define go_version 1.12.10 Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} @@ -24,7 +25,7 @@ Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service Kube DNS component License: %{_platform_license} and Apache License and GNU Lesser General Public License v3.0 only and BSD 3-clause New or Revised License and MIT License and Common Development and Distribution License and BSD and GNU General Public License v2.0 only URL: https://github.com/kubernetes/dns -BuildArch: x86_64 +BuildArch: %{_arch} Vendor: %{_platform_vendor} and Kubernetes DNS service unmodified Source0: %{name}-%{version}.tar.gz @@ -49,7 +50,8 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg KUBEDNS="%{RPM_MAJOR_VERSION}" \ + --build-arg KUBEDNS_VERSION="%{RPM_MAJOR_VERSION}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/