Skip to content
This repository has been archived by the owner on Jul 5, 2021. It is now read-only.

Commit

Permalink
NVR: docker-2:1.12.2-5.git93e4836
Browse files Browse the repository at this point in the history
- built docker @projectatomic/docker-1.12 commit 93e4836
- built docker-selinux commit 51001dd
- built d-s-s commit abe18de
- built docker-novolume-plugin commit c521254
- built docker-runc @projectatomic/runc-1.12 commit 06a5a24
- built docker-utils commit
- built docker-containerd commit 0366d7e
- built docker-v1.10-migrator commit 994c35c

Signed-off-by: Antonio Murdaca <[email protected]>
  • Loading branch information
runcom committed Oct 21, 2016
1 parent df95a02 commit 354979f
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,5 @@
/docker-selinux-9e96359.tar.gz
/docker-storage-setup-96594f9.tar.gz
/docker-storage-setup-abe18de.tar.gz
/docker-93e4836.tar.gz
/docker-selinux-51001dd.tar.gz
24 changes: 20 additions & 4 deletions docker.spec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}

# docker
%global git0 https://github.com/projectatomic/%{repo}
%global commit0 15c82b8be1843ef8f2e7e4c1ee639e9ef622face
# FIXME(runcom): built from https://github.com/projectatomic/docker/pull/205
%global git0 https://github.com/runcom/%{repo}
%global commit0 93e483676f192eb88667cd9449208003c0b8028c
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# docker_branch used in %%check
%global docker_branch docker-1.12.2
Expand All @@ -42,7 +43,7 @@
# docker-selinux
%global git2 https://github.com/projectatomic/container-selinux
%if 0%{?fedora}
%global commit2 9e96359b3d0ce823693334ac8cc9298e6e99b275
%global commit2 51001dd9052288a6f2356db61bcf4a3084497366
%else
%global commit2 032bcda7b1eb6d9d75d3c0ce64d9d35cdb9c7b85
%endif
Expand Down Expand Up @@ -94,7 +95,7 @@ Name: %{repo}
Epoch: 2
%endif
Version: 1.12.2
Release: 4.git%{shortcommit0}%{?dist}
Release: 5.git%{shortcommit0}%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
Expand Down Expand Up @@ -126,6 +127,8 @@ Source17: README-%{repo}-common

BuildRequires: git
BuildRequires: glibc-static
BuildRequires: gpgme-devel
BuildRequires: libassuan-devel
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang >= 1.6.2}
BuildRequires: go-md2man
BuildRequires: device-mapper-devel
Expand All @@ -144,6 +147,9 @@ BuildRequires: pkgconfig(systemd)
Requires: device-mapper-libs >= 1.02.90-1
%endif

Requires: skopeo-containers
Requires: gnupg

# Resolves: #1379184 - include epoch
Requires: %{repo}-common = %{epoch}:%{version}-%{release}

Expand Down Expand Up @@ -856,6 +862,16 @@ exit 0
%{_datadir}/rhel/secrets/rhsm

%changelog
* Fri Oct 21 2016 Antonio Murdaca <[email protected]> - 2:1.12.2-5.git93e4836
- built docker @projectatomic/docker-1.12 commit 93e4836
- built docker-selinux commit 51001dd
- built d-s-s commit abe18de
- built docker-novolume-plugin commit c521254
- built docker-runc @projectatomic/runc-1.12 commit 06a5a24
- built docker-utils commit
- built docker-containerd commit 0366d7e
- built docker-v1.10-migrator commit 994c35c

* Fri Oct 21 2016 Antonio Murdaca <[email protected]> - 2:1.12.2-4.git15c82b8
- built docker @projectatomic/docker-1.12 commit 15c82b8
- built docker-selinux commit 9e96359
Expand Down
4 changes: 2 additions & 2 deletions sources
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
9e7690cc09625bdb34f7a9fedff270eb containerd-0366d7e.tar.gz
b53e82cb680d8f6637302c2cbcb54b8e docker-15c82b8.tar.gz
85e6f773d8121272264e5cf8c0870ad8 docker-93e4836.tar.gz
8877736d117aaf4b3f4f118e5a3554c1 docker-novolume-plugin-c521254.tar.gz
bdc7df9f79671b7624017270baccaf9b docker-selinux-9e96359.tar.gz
0df0fff9f71091bd578734e30acd04b7 docker-selinux-51001dd.tar.gz
6038bcde16b97e48faae7c770a0f8fc0 docker-storage-setup-abe18de.tar.gz
e5f6226690a3a4f4801449e5a021075c runc-06a5a24.tar.gz
1f7d112be5ba2380804762d965f9954d v1.10-migrator-994c35c.tar.gz

0 comments on commit 354979f

Please sign in to comment.