X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-cpupooler.git;a=blobdiff_plain;f=rpmbuild.spec;h=f944bddbf3778ecc4c00d713d89d9c71e18acce0;hp=6a9f159049a34218fd0d6ec2bbe6abf0de0c54c4;hb=1c00762f8f3a78c0d6bd5ca177018effdbe10ca3;hpb=b9ac39f73c57f3438962b37d70d95fd1f63464f0 diff --git a/rpmbuild.spec b/rpmbuild.spec index 6a9f159..f944bdd 100644 --- a/rpmbuild.spec +++ b/rpmbuild.spec @@ -16,9 +16,10 @@ %define COMPONENT_PART process-starter %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 0.3.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 +%define go_version 1.12.9 %define CPUPOOLER_VERSION d94704e4b2f9f91ee712c6385038413fb7aa064a -%define DEPENDENCY_MANAGER_VERSION 0.5.0 +%define DEP_MAN_VERSION 0.5.0 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define PROCESS_STARTER_INSTALL_PATH /opt/bin/ @@ -57,8 +58,9 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \ - --build-arg CPUPOOLER="%{CPUPOOLER_VERSION}" \ + --build-arg go_version="%{go_version}" \ + --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \ + --build-arg CPUPOOLER_VERSION="%{CPUPOOLER_VERSION}" \ --tag %{COMPONENT_PART}:builder \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT_PART}/ @@ -103,8 +105,9 @@ docker build \ --build-arg http_proxy="${http_proxy}" \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ - --build-arg DEPENDENCY_MANAGER="%{DEPENDENCY_MANAGER_VERSION}" \ - --build-arg CPUPOOLER="%{CPUPOOLER_VERSION}" \ + --build-arg DEP_MAN_VERSION="%{DEP_MAN_VERSION}" \ + --build-arg CPUPOOLER_VERSION="%{CPUPOOLER_VERSION}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/