diff --git a/.gitignore b/.gitignore index 054889f..7c51d55 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/oci-umount-bf16163.tar.gz +SOURCES/oci-umount-e3c9055.tar.gz diff --git a/.oci-umount.metadata b/.oci-umount.metadata index a2b6793..6e032de 100644 --- a/.oci-umount.metadata +++ b/.oci-umount.metadata @@ -1 +1 @@ -44b6f65b4df4bbfc3e52c75e58c0482e339e46ae SOURCES/oci-umount-bf16163.tar.gz +343975ae005b951a86950dcc79d3f2fa986e2a30 SOURCES/oci-umount-e3c9055.tar.gz diff --git a/SPECS/oci-umount.spec b/SPECS/oci-umount.spec index bf00bd8..389285c 100644 --- a/SPECS/oci-umount.spec +++ b/SPECS/oci-umount.spec @@ -1,70 +1,112 @@ -%global git0 https://github.com/projectatomic/%{name} -%global commit0 bf161637aa6de4488b9d8db0211faf3c8097a41e -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - -Name: oci-umount -Epoch: 2 -Version: 2.3.1 -Release: 2.git%{shortcommit0}%{?dist} -# no go-md2man for ppc64 -ExcludeArch: ppc64 -URL: %{git0} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -License: GPLv3+ -Summary: OCI umount hook for container runtimes -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: git -BuildRequires: go-md2man -BuildRequires: pkgconfig(yajl) -BuildRequires: pkgconfig(libselinux) -BuildRequires: pkgconfig(mount) -BuildRequires: pcre-devel +%global provider github +%global provider_tld com +%global project projectatomic +%global repo oci-umount +# https://github.com/projectatomic/oci-umount +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit e3c905541fe7d33d9e89b96c56c5019aeacca932 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + +Name: oci-umount +Epoch: 2 +Version: 2.3.3 +Release: 3.git%{shortcommit}%{?dist} +Summary: OCI umount hook for docker +Group: Applications/Text +License: GPLv3+ +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +#exclude ppc64, the same arches as docker +ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} Obsoletes: docker-%{name} <= 2:1.13.1-22 -Provides: docker-%{name} = %{epoch}:%{version}-%{release} +Provides: docker-%{name} = %{epoch}-%{version}-%{release} + +BuildRequires: gcc +BuildRequires: git +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: pkgconfig(yajl) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(mount) +BuildRequires: golang-github-cpuguy83-go-md2man +BuildRequires: pcre-devel %description -OCI umount hooks unmount potential leaked mount points in a containers -mount namespaces. +OCI umount hooks umount potential leaked mount points in a containers +mount name-spaces %prep -%autosetup -Sgit -n %{name}-%{commit0} +%setup -q -n %{name}-%{commit} %build autoreconf -i %configure --libexecdir=%{_libexecdir}/oci/hooks.d/ -make %{?_smp_mflags} +%make_build %install %make_install - -%check - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +install -d %{buildroot}%{_datadir}/%{name}/%{name}.d %files -%license LICENSE +%{_libexecdir}/oci/hooks.d/%{name} +%{_mandir}/man1/%{name}.1* %doc README.md +%license LICENSE %config(noreplace) %{_sysconfdir}/%{name}.conf %dir %{_libexecdir}/oci %dir %{_libexecdir}/oci/hooks.d -%{_libexecdir}/oci/hooks.d/%{name} -%{_mandir}/man1/%{name}.1* -#% config(noreplace)? probably not in /usr/share +%dir %{_datadir}/containers/oci/hooks.d +%dir %{_datadir}/%{name} +%dir %{_datadir}/%{name}/%{name}.d +%{_datadir}/%{name}/oci-umount-options.conf %{_datadir}/containers/oci/hooks.d/%{name}.json -%{_datadir}/%{name}/%{name}-options.conf +%ghost %{_sysconfdir}/%{name}/%{name}.d +%ghost /etc/oci-umount/oci-umount-options.conf %changelog -* Mon Dec 11 2017 Frantisek Kluknavsky - 2:2.3.1-2.gitbf16163 -- rebased to 2.3.1 +* Thu Feb 01 2018 Lokesh Mandvekar - 2:2.3.3-3.gite3c9055 +- provides: docker-oci-umount = epoch:version-release + +* Thu Feb 01 2018 Lokesh Mandvekar - 2:2.3.3-2.gite3c9055 +- correct Obsoletes that were messed up probably cause of reusing fedora spec + +* Mon Jan 22 2018 Dan Walsh - 2:2.3.3-1.git +- Support passing of stage via stage environment variable. + +* Thu Dec 21 2017 Dan Walsh - 2:2.3.2-1.git +- Fix oci-umount.json to run in stages to support CRI-O + +* Tue Nov 7 2017 Dan Walsh - 2:2.3.1-1.git51e7c505 +- Provide a knob log_level to control verbosity of messages + +* Thu Sep 21 2017 Dan Walsh - 2:2.2.0-2.git0a4dcd6 +* Thu Sep 21 2017 Dan Walsh - 2:2.2.0-2.git0a4dcd6 +- Add support for multiple configuration files. + oci-umount will still read config file /etc/oci-umount.conf if it + exists, but will also read config files in /usr/share/oci-umount/oci-umount.d + and config files in /etc/oci-umount/oci-umount.d. If the same file name exists + in both directories, then oci-umount will only use the content in /ect/oci-umount/oci-umount.d. +- Make Logs less noisy +- Improve logs output, adding containier id, and needed file information +- Add support for specifying submounts PATH/* will unmount all mountpoints + under PATH in a container +- Support for oci configuration files to specify when to run the plugin + +* Thu Sep 21 2017 Lokesh Mandvekar - 2:2.2.0-1.git0a4dcd6 +- bump to v2.2.0 + +* Thu Aug 17 2017 Frantisek Kluknavsky - 2:2.0.0-2.gitf90b64c +- rebased to f90b64c144ff1a126f7c57b32396e8990ca696fd + +* Thu Jul 27 2017 Frantisek Kluknavsky - 2:1.13-103.git7623f6a +- obsolete with epoch -* Tue Nov 07 2017 Lokesh Mandvekar - 2:2.3.0-1.git51e7c50 -- rebase to v2.3.0 +* Thu Jul 20 2017 fkluknav - 2:1.13-102.git7623f6a +- fixes according to package review -* Thu Oct 19 2017 Frantisek Kluknavsky - 2:2.2.0-1.gite3fbbfb -- rebased to e3fbbfb7e4ce04a256ea8f11858a84faa307b7bd +* Mon Jul 17 2017 fkluknav - 2:1.13-101.git7623f6a +- adapted for Fedora, versioning continues from the current docker version -* Mon Aug 14 2017 Lokesh Mandvekar - 2:2.0.0-1.git299e781 -- initial build as independent package -- obsoletes docker-oci-umount +* Wed May 17 2017 Dan Walsh - 0.1.1 +- Initial RPM release