starlingx/integ
Code Issues Proposed changes

Upversion docker distribution to v2.7.1

Browse Source 
Move docker distribution to v2.7.1 and build from the archived release
tarball.

Change-Id: I086540d97cd9907cd84d35231a5ba72bdb4db60d
Depends-On: https://review.opendev.org/723789
Story: 2006999
Task: 37771
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2020-04-27 18:50:19 -04:00
parent fc125a7a24
commit c51ea69cbf
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
centos_tarball-dl.lst
View File

@ -5,7 +5,7 @@ ceph-object-corpus-e32bf8ca3dc6151ebe7f205ba187815bc18e1cef.tar.gz#ceph-object-c
civetweb-ff2881e2cd5869a71ca91083bad5d12cccd22136.tar.gz#civetweb#https://api.github.com/repos/ceph/civetweb/tarball/ff2881e2cd5869a71ca91083bad5d12cccd22136#https## civetweb-ff2881e2cd5869a71ca91083bad5d12cccd22136.tar.gz#civetweb#https://api.github.com/repos/ceph/civetweb/tarball/ff2881e2cd5869a71ca91083bad5d12cccd22136#https##
containerd-v1.3.3.tar.gz#containerd#https://github.com/containerd/containerd/archive/v1.3.3.tar.gz#https## containerd-v1.3.3.tar.gz#containerd#https://github.com/containerd/containerd/archive/v1.3.3.tar.gz#https##
crictl-v1.18.0-linux-amd64.tar.gz#crictl#https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.18.0/crictl-v1.18.0-linux-amd64.tar.gz#https## crictl-v1.18.0-linux-amd64.tar.gz#crictl#https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.18.0/crictl-v1.18.0-linux-amd64.tar.gz#https##
# docker-distribution-48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#docker-distribution#github.com/docker/distribution/archive/48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89.tar.gz#http## docker-distribution-v2.7.1.tar.gz#docker-distribution-2.7.1#https://github.com/docker/distribution/archive/v2.7.1.tar.gz#http##
# docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#docker-libtrust#https://github.com/docker/libtrust/archive/fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#http## # docker-libtrust-fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#docker-libtrust#https://github.com/docker/libtrust/archive/fa567046d9b14f6aa788882a950d69651d230b21.tar.gz#http##
dpdk-18.11.tar.xz#dpdk-18.11#http://fast.dpdk.org/rel/dpdk-18.11.tar.xz#http## dpdk-18.11.tar.xz#dpdk-18.11#http://fast.dpdk.org/rel/dpdk-18.11.tar.xz#http##
dpdk-6ece49ad5a26f5e2f5c4af6c06c30376c0ddc387.tar.gz#dpdk#https://api.github.com/repos/spdk/dpdk/tarball/6ece49ad5a26f5e2f5c4af6c06c30376c0ddc387#https## dpdk-6ece49ad5a26f5e2f5c4af6c06c30376c0ddc387.tar.gz#dpdk#https://api.github.com/repos/spdk/dpdk/tarball/6ece49ad5a26f5e2f5c4af6c06c30376c0ddc387#https##

8
kubernetes/docker-distribution/centos/build_srpm.data
View File

@ -1,6 +1,6 @@
VERSION=2.7.1
TAR_NAME="docker-distribution" TAR_NAME="docker-distribution"
SRC_DIR="$CGCS_BASE/git/docker-distribution" TAR="$TAR_NAME-v$VERSION.tar.gz"
COPY_LIST="$FILES_BASE/*" COPY_LIST="${CGCS_BASE}/downloads/$TAR $FILES_BASE/*"
TIS_PATCH_VER=1
TIS_BASE_SRCREV=48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89
TIS_PATCH_VER=GITREVCOUNT

10
kubernetes/docker-distribution/centos/docker-distribution.spec
View File

@ -34,12 +34,12 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: %{project}-%{repo} Name: %{project}-%{repo}
Version: 2.6.2 Version: 2.7.1
Release: 1%{?_tis_dist}.%{tis_patch_ver} Release: 1%{?_tis_dist}.%{tis_patch_ver}
Summary: Docker toolset to pack, ship, store, and deliver content Summary: Docker toolset to pack, ship, store, and deliver content
License: ASL 2.0 License: ASL 2.0
URL: https://%{provider_prefix} URL: https://%{provider_prefix}
Source0: %{project}-%{repo}-%{version}.tar.gz Source0: %{project}-%{repo}-v%{version}.tar.gz
Source1: %{name}.service Source1: %{name}.service
Source2: config.yml Source2: config.yml
BuildRequires: systemd BuildRequires: systemd
@ -295,7 +295,7 @@ make test
%else %else
%doc LICENSE %doc LICENSE
%endif %endif
%doc AUTHORS CONTRIBUTING.md MAINTAINERS README.md %doc CONTRIBUTING.md MAINTAINERS README.md
%{_bindir}/registry %{_bindir}/registry
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%dir %{_sharedstatedir}/registry %dir %{_sharedstatedir}/registry
@ -308,14 +308,14 @@ make test
%else %else
%doc LICENSE %doc LICENSE
%endif %endif
%doc CONTRIBUTING.md README.md ROADMAP.md AUTHORS %doc CONTRIBUTING.md README.md ROADMAP.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%endif %endif
%if 0%{?with_unit_test} && 0%{?with_devel} %if 0%{?with_unit_test} && 0%{?with_devel}
%files unit-test -f unit-test.file-list %files unit-test -f unit-test.file-list
%license LICENSE %license LICENSE
%doc CONTRIBUTING.md README.md ROADMAP.md AUTHORS %doc CONTRIBUTING.md README.md ROADMAP.md
%endif %endif
%changelog %changelog