- spec: change hardcoded x86_64 arch to current platform arch;
- Dockerfile: Instead of pulling CentOS base images from dockerhub,
create them from scratch from the official SIG-cloudinstance repo:
http://artifacts.ci.centos.org/sig-cloudinstance/
- nginx.repo: Use $basearch instead of hardcoded x86_64;
- spec: Bump minor RPM version;
Co-authored-by: Jimmy Lafontaine Rivera <lafonj@gmail.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Change-Id: I1415675c7b2aae250b8f5dbd1e370a84ee5a878f
%define COMPONENT registry
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.7.1
%define COMPONENT registry
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.7.1
-%define RPM_MINOR_VERSION 9
+%define RPM_MINOR_VERSION 10
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define go_version 1.12.10
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define go_version 1.12.10
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
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
Vendor: %{_platform_vendor} and docker/distribution unmodified
Source0: %{name}-%{version}.tar.gz
Vendor: %{_platform_vendor} and docker/distribution unmodified
Source0: %{name}-%{version}.tar.gz
%define COMPONENT swift
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.22.0
%define COMPONENT swift
%define RPM_NAME caas-%{COMPONENT}
%define RPM_MAJOR_VERSION 2.22.0
-%define RPM_MINOR_VERSION 2
+%define RPM_MINOR_VERSION 3
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
%define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
+%define centos_build 191001
Name: %{RPM_NAME}
Version: %{RPM_MAJOR_VERSION}
Release: %{RPM_MINOR_VERSION}%{?dist}
Summary: Containers as a Service Swift 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/openstack/swift
Name: %{RPM_NAME}
Version: %{RPM_MAJOR_VERSION}
Release: %{RPM_MINOR_VERSION}%{?dist}
Summary: Containers as a Service Swift 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/openstack/swift
Vendor: %{_platform_vendor} and openstack/swift unmodified
Source0: %{name}-%{version}.tar.gz
Requires: docker-ce >= 18.09.2, rsync
Vendor: %{_platform_vendor} and openstack/swift unmodified
Source0: %{name}-%{version}.tar.gz
Requires: docker-ce >= 18.09.2, rsync
-BuildRequires: docker-ce-cli >= 18.09.2, xz
+BuildRequires: docker-ce-cli >= 18.09.2, xz, wget
%description
This rpm contains the swift container and ansible for caas subsystem.
%description
This rpm contains the swift container and ansible for caas subsystem.
+wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build/%{COMPONENT}/centos-7-docker.tar.xz
# Building the container
docker build \
--network=host \
# Building the container
docker build \
--network=host \
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
+FROM scratch
+ADD centos-7-docker.tar.xz /
+CMD ["/bin/bash"]
MAINTAINER Balint Varga <balint.varga@nokia.com>
ARG SWIFT
MAINTAINER Balint Varga <balint.varga@nokia.com>
ARG SWIFT
[nginx-epel-7]
name=Nginx Epel
[nginx-epel-7]
name=Nginx Epel
-baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/
+baseurl=https://dl.fedoraproject.org/pub/epel/7/$basearch/
enabled=1
metadata_expire=1d
gpgcheck=0
enabled=1
metadata_expire=1d
gpgcheck=0