X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fregistry.spec;h=56a414c2f7f5382898d70b9387073d53f5c7005d;hb=f85f58936fd8af9f6e759f042b5f9725ddc91f5d;hp=7443b744ca49265f0c2b88dc9d9fbe0904da0e1d;hpb=2ed671c54dad28dd81763928b28cd17d5c76df66;p=ta%2Fcaas-registry.git diff --git a/SPECS/registry.spec b/SPECS/registry.spec index 7443b74..56a414c 100644 --- a/SPECS/registry.spec +++ b/SPECS/registry.spec @@ -15,20 +15,22 @@ %define COMPONENT registry %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 2.7.1 -%define RPM_MINOR_VERSION 1 +%define RPM_MINOR_VERSION 10 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} +%define go_version 1.12.10 + Name: %{RPM_NAME} Version: %{RPM_MAJOR_VERSION} Release: %{RPM_MINOR_VERSION}%{?dist} Summary: Containers as a Service Registry 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/docker/distribution -BuildArch: x86_64 +BuildArch: %{_arch} Vendor: %{_platform_vendor} and docker/distribution unmodified Source0: %{name}-%{version}.tar.gz -Requires: docker-ce >= 18.09.2 -BuildRequires: docker-ce >= 18.09.2 +Requires: docker-ce >= 18.09.2, rsync +BuildRequires: docker-ce-cli >= 18.09.2, xz %description This rpm contains the docker registry container and ansible for caas subsystem. @@ -50,6 +52,7 @@ docker build \ --build-arg https_proxy="${https_proxy}" \ --build-arg no_proxy="${no_proxy}" \ --build-arg REGISTRY="%{version}" \ + --build-arg go_version="%{go_version}" \ --tag %{COMPONENT}:%{IMAGE_TAG} \ %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/ @@ -57,7 +60,7 @@ docker build \ mkdir -p %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/ # Save the container -docker save %{COMPONENT}:%{IMAGE_TAG} | gzip -c > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar +docker save %{COMPONENT}:%{IMAGE_TAG} | xz -z -T2 > %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save/%{COMPONENT}:%{IMAGE_TAG}.tar # Remove container docker rmi -f %{COMPONENT}:%{IMAGE_TAG} @@ -96,4 +99,3 @@ fi %clean rm -rf ${buildroot} -