From 5e9df7751708ef17719e87ec77834bdaf6578903 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 06 2016 17:24:32 +0000 Subject: import docker-latest-1.12.3-10.el7 --- diff --git a/.docker-latest.metadata b/.docker-latest.metadata index e575095..fd62e1d 100644 --- a/.docker-latest.metadata +++ b/.docker-latest.metadata @@ -1,5 +1,5 @@ -881c2f10ded4ff4ef6e79370c3810cec54950d31 SOURCES/containerd-0ac3cd1.tar.gz -a84215682d8d5d3f82f837b12c74b7a9f2fdc59e SOURCES/docker-f1040da.tar.gz -4436cb79f58f8fa8206ec1eddf541cafa3f013f7 SOURCES/docker-storage-setup-d642523.tar.gz +8fc56455907050789e020786df5e52641eaec5ba SOURCES/containerd-b818e74.tar.gz +5e7b051912347159ae4c4f49db2f3de61eff8034 SOURCES/docker-0e5a8b1.tar.gz +69c5ba21f0de4b6c39ccb905dc27df5a03e69765 SOURCES/docker-storage-setup-c9faba1.tar.gz 66fa30802244a12e8364828ba4be2d31bd9d1f4f SOURCES/runc-f509e50.tar.gz ea4b3d96c46fccb6781d66a6c53c087b179c80fe SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/.gitignore b/.gitignore index 0779eac..2d15137 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/containerd-0ac3cd1.tar.gz -SOURCES/docker-f1040da.tar.gz -SOURCES/docker-storage-setup-d642523.tar.gz +SOURCES/containerd-b818e74.tar.gz +SOURCES/docker-0e5a8b1.tar.gz +SOURCES/docker-storage-setup-c9faba1.tar.gz SOURCES/runc-f509e50.tar.gz SOURCES/v1.10-migrator-c417a6a.tar.gz diff --git a/SPECS/docker-latest.spec b/SPECS/docker-latest.spec index 394122c..21f261c 100644 --- a/SPECS/docker-latest.spec +++ b/SPECS/docker-latest.spec @@ -9,6 +9,8 @@ # modifying the dockerinit binary breaks the SHA1 sum check by docker %global __os_install_post %{_rpmconfigdir}/brp-compress +%global with_migrator 1 + # docker builds in a checksum of dockerinit into docker, # so stripping the binaries breaks docker %if 0%{?with_debug} @@ -24,24 +26,33 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} +# macros for 'docker' package VR +%global docker_epoch 2 +%global docker_ver 1.10.3 +%global docker_rel 58 +%global with_diff_docker 1 + # docker %global git0 https://github.com/projectatomic/%{repo} -%global commit0 f1040da127b7f1167ab351cb429ac5faa421c7cf +%global commit0 0e5a8b1aca91821971e556fef2fb0e50fcca5470 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # docker_branch used in %%check -%global docker_branch docker-1.12 +%global docker_branch docker-1.12.3 # d-s-s %global git1 https://github.com/projectatomic/%{repo}-storage-setup/ -%global commit1 d642523c163820137c9ef07f4cbcb148c98aacf5 +%global commit1 c9faba1908b8e77f7c7c443f26e3b3cb1450d1a0 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) %global dss_libdir %{_exec_prefix}/lib/%{name}-storage-setup +%if 0%{with_migrator} # v1.10-migrator %global git2 https://github.com/%{repo}/v1.10-migrator %global commit2 c417a6a022c5023c111662e8280f885f6ac259be %global shortcommit2 %(c=%{commit2}; echo ${c:0:7}) +%endif # with_migrator +%if 0%{with_diff_docker} # docker-runc %global git8 https://github.com/projectatomic/runc %global commit8 f509e5094de84a919e2e8ae316373689fb66c513 @@ -49,8 +60,9 @@ # docker-containerd %global git9 https://github.com/docker/containerd -%global commit9 0ac3cd1be170d180b2baed755e8f0da547ceb267 +%global commit9 b818e749726ba18e430bb825396c85408dfaf2a4 %global shortcommit9 %(c=%{commit9}; echo ${c:0:7}) +%endif # with_diff_docker # Version of SELinux %if 0%{?fedora} >= 22 @@ -60,15 +72,17 @@ %endif Name: %{repo}-latest -Version: 1.12.1 -Release: 3%{?dist} +Version: 1.12.3 +Release: 10%{?dist} Summary: Automates deployment of containerized applications License: ASL 2.0 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo} ExclusiveArch: x86_64 Source0: %{git0}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source1: %{git1}/archive/%{commit1}/%{repo}-storage-setup-%{shortcommit1}.tar.gz +%if 0%{with_migrator} Source2: %{git2}/archive/%{commit2}/v1.10-migrator-%{shortcommit2}.tar.gz +%endif # with_migrator Source3: v1.10-migrator-helper Source5: %{name}.service Source6: %{name}.sysconfig @@ -76,9 +90,11 @@ Source7: %{name}-storage.sysconfig Source8: %{name}-logrotate.sh Source9: README.%{name}-logrotate Source10: %{name}-network.sysconfig +%if 0%{with_diff_docker} Source11: %{git8}/archive/%{commit8}/runc-%{shortcommit8}.tar.gz Source12: %{git9}/archive/%{commit9}/containerd-%{shortcommit9}.tar.gz #Source13: %%{repo}-containerd.service +%endif # with_diff_docker BuildRequires: git BuildRequires: glibc-static BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} >= 1.6.2 @@ -88,19 +104,17 @@ BuildRequires: device-mapper-devel BuildRequires: pkgconfig(audit) BuildRequires: btrfs-progs-devel BuildRequires: sqlite-devel +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel BuildRequires: pkgconfig(systemd) Requires: device-mapper-libs >= 7:1.02.97 # RE: rhbz#1195804 - ensure min NVR for selinux-policy Requires(pre): selinux-policy >= %{selinux_policyver} -# macros for 'docker' package VR -%global docker_ver 1.10.3 -%global docker_rel 53 - -Requires(pre): %{repo}-selinux >= %{docker_ver}-%{docker_rel} -Requires: %{repo}-common >= %{docker_ver}-%{docker_rel} -Requires: %{repo}-rhel-push-plugin >= %{docker_ver}-%{docker_rel} +Requires(pre): container-selinux >= %{docker_epoch}:%{docker_ver}-%{docker_rel} +Requires: %{repo}-common >= %{docker_epoch}:%{docker_ver}-%{docker_rel} +Requires: %{repo}-rhel-push-plugin >= %{docker_epoch}:%{docker_ver}-%{docker_rel} Requires: oci-register-machine >= 1:0-1.8 Requires: oci-systemd-hook >= 1:0.1.4-4 @@ -109,7 +123,7 @@ Requires: xz Provides: lxc-%{name} = %{version}-%{release} # Match with upstream name -Provides: %{name}-engine = %{version}-%{release} +Provides: %{repo}-engine-latest = %{version}-%{release} # needs tar to be able to run containers Requires: tar @@ -122,6 +136,8 @@ Requires: lvm2 >= 7:1.02.97 Requires: xfsprogs Obsoletes: %{repo}-storage-setup <= 0.5-3 +Requires: skopeo-containers +Requires: gnupg %description Docker is an open-source engine that automates the deployment of any @@ -149,6 +165,7 @@ Requires: %{name} = %{version}-%{release} This package installs %{summary}. logrotate is assumed to be installed on containers for this to work, failures are silently ignored. +%if 0%{with_migrator} %package v1.10-migrator License: ASL 2.0 and CC-BY-SA Summary: Calculates SHA256 checksums for docker layer content @@ -164,6 +181,8 @@ The migration usually runs on daemon startup but it can be quite slow(usually that time. You can run this tool instead while the old daemon is still running and skip checksum calculation on startup. +%endif # with_migrator + %prep %autosetup -Sgit -n %{repo}-%{commit0} @@ -182,9 +201,12 @@ sed -i 's/%{repo}/%{name}/g' %{repo}-storage-setup* sed -i 's/%{name}_devmapper_meta_dir/%{repo}_devmapper_meta_dir/g' %{repo}-storage-setup* popd +%if 0%{with_migrator} # untar v1.10-migrator tar zxf %{SOURCE2} +%endif # with_migrator +%if 0%{with_diff_docker} # untar docker-runc tar zxf %{SOURCE11} @@ -193,7 +215,7 @@ tar zxf %{SOURCE12} # docker-containerd unitfile #cp %%{SOURCE13} . - +%endif # with_diff_docker %build # set up temporary build gopath, and put our directory there @@ -204,7 +226,7 @@ ln -s $(dirs +1 -l) src/%{import_path} popd export DOCKER_GITCOMMIT="%{shortcommit0}/%{version}" -export DOCKER_BUILDTAGS="selinux seccomp" +export DOCKER_BUILDTAGS='selinux seccomp' export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} #sed -i '/LDFLAGS_STATIC/d' hack/make/.dockerinit @@ -222,25 +244,30 @@ popd cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax cp contrib/syntax/vim/README.md README-vim-syntax.md +%if 0%{with_migrator} # build v1.10-migrator pushd v1.10-migrator-%{commit2} -export GOPATH=$GOPATH:$(pwd)/Godeps/_workspace +export GOPATH=%{gopath}:$(pwd)/Godeps/_workspace sed -i 's/godep //g' Makefile make v1.10-migrator-local popd +%endif # with_migrator +%if 0%{with_diff_docker} # build %%{repo}-runc pushd runc-%{commit8} -make BUILDTAGS="seccomp selinux" +make BUILDTAGS='seccomp selinux' popd # build %%{name}-containerd pushd _build ln -s $(dirs +1 -l)/containerd-%{commit9} src/%{provider}.%{provider_tld}/%{repo}/containerd popd +export GOPATH=$(pwd)/_build:$(pwd)/vendor:%{gopath} pushd containerd-%{commit9} make popd +%endif # with_diff_docker %install # install binary @@ -260,8 +287,8 @@ for x in bundles/latest; do continue fi rm $x/dynbinary-daemon/*.{md5,sha256} - install -p -m 755 $x/dynbinary-daemon/%{repo}-proxy-* %{buildroot}%{_bindir}/%{repo}-proxy install -p -m 755 $x/dynbinary-daemon/%{repo}d-* %{buildroot}%{_bindir}/%{repo}d-latest + install -p -m 755 $x/dynbinary-daemon/%{repo}d-* %{buildroot}%{_bindir}/%{repo}-proxy break done @@ -368,13 +395,16 @@ install -d %{buildroot}%{_sysconfdir}/sysconfig install -p -m 644 %{repo}-storage-setup-override.conf %{buildroot}%{_sysconfdir}/sysconfig/%{name}-storage-setup popd +%if 0%{with_migrator} # install v1.10-migrator install -d %{buildroot}%{_bindir} install -p -m 700 v1.10-migrator-%{commit2}/v1.10-migrator-local %{buildroot}%{_bindir}/%{name}-v1.10-migrator-local # install v1.10-migrator-helper install -p -m 700 %{SOURCE3} %{buildroot}%{_bindir}/%{name}-v1.10-migrator-helper +%endif # with_migrator +%if 0%{with_diff_docker} # install docker-runc install -d %{buildroot}%{_libexecdir}/%{repo} install -p -m 755 runc-%{commit8}/runc %{buildroot}%{_libexecdir}/%{repo}/%{repo}-runc @@ -386,6 +416,7 @@ install -p -m 755 containerd-%{commit9}/bin/containerd-shim %{buildroot}%{_libex install -p -m 755 containerd-%{commit9}/bin/ctr %{buildroot}%{_libexecdir}/%{repo}/%{repo}-ctr # docker-containerd unitfile #install -p -m 644 %%{SOURCE13} %%{buildroot}%%{_unitdir} +%endif # with_diff_docker %check [ ! -w /run/%{name}.sock ] || { @@ -422,8 +453,8 @@ exit 0 %{_mandir}/man5/Dockerfile-latest.5.gz %{_mandir}/man8/%{repo}d-latest.8.gz %{_bindir}/%{name} -%{_bindir}/%{repo}d-latest %{_bindir}/%{repo}-proxy +%{_bindir}/%{repo}d-latest %{_bindir}/%{name}-storage-setup %{_unitdir}/%{name}.service %{_unitdir}/%{name}-storage-setup.service @@ -466,12 +497,49 @@ exit 0 %doc README.%{name}-logrotate %{_sysconfdir}/cron.daily/%{name}-logrotate +%if 0%{with_migrator} %files v1.10-migrator %license v1.10-migrator-%{commit2}/LICENSE.{code,docs} %doc v1.10-migrator-%{commit2}/{CONTRIBUTING,README}.md %{_bindir}/%{name}-v1.10-migrator-* +%endif # with_migrator %changelog +* Fri Nov 18 2016 Lokesh Mandvekar - 1.12.3-10 +- depend on docker-common, container-selinux >= 2:1.10.3-58 + +* Fri Nov 18 2016 Lokesh Mandvekar - 1.12.3-9 +- docker rollback to 1.10.3, use docker-common >= 1.10.3-57 +- built containerd commit b818e74 + +* Tue Nov 15 2016 Lokesh Mandvekar - 1.12.3-8 +- keep version-release consistent for docker and docker-latest +- Epoch value left untouched + +* Tue Nov 15 2016 Lokesh Mandvekar - 1.12.3-4 +- use docker>= 1.12.3-7 + +* Tue Nov 15 2016 Lokesh Mandvekar - 1.12.3-3 +- built docker projectatomic/docker-1.12.3 commit 0e5a8b1 +- built d-s-s commit c9faba1 +- use docker >= 1.12.3-6 + +* Tue Nov 01 2016 Lokesh Mandvekar - 1.12.3-2 +- built docker imcleod/docker-1.12.3-stdio-candidate commit 5905214 + +* Thu Oct 27 2016 Lokesh Mandvekar - 1.12.3-1 +- Resolves: #1328242 #1366802 #1365217 +- built docker projectatomic/docker-1.12.3 commit 5759a08 +- built d-s-s commit 308c5e3 + +* Wed Oct 05 2016 Lokesh Mandvekar - 1.12.2-2 +- bump to 1.12.2 +- built docker projectatomic/docker-1.12.2 commit e80bc9d +- built d-s-s commit 96594f9 + +* Mon Sep 26 2016 Lokesh Mandvekar - 1.12.1-4 +- built rhvgoyal/shared-rootfs-pjat commit ce09548 + * Wed Sep 07 2016 Lokesh Mandvekar - 1.12.1-3 - Resolves: #1373969 - rebuild for 7.3 - use docker-common >= 1.10-3-53 and selinux-policy >= 3.13.1-97