jpopelka pushed to dock (f21). "Merge branch 'epel7' into f21"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue May 5 12:22:24 UTC 2015
>From baa8b6af04e2cfdfcb27a26a6adaa25d74b676e2 Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Fri, 20 Feb 2015 10:46:49 +0100
Subject: initial commit
1.1.0 release
diff --git a/.gitignore b/.gitignore
index e69de29..60b3ef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
diff --git a/dock.spec b/dock.spec
new file mode 100644
index 0000000..608b82b
--- /dev/null
+++ b/dock.spec
@@ -0,0 +1,186 @@
+%global with_python3 0
+
+%global owner DBuildService
+%global project dock
+
+%global commit 4bd2f17017a62184d43da1bb689110c9562b0956
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name: dock
+Version: 1.1.0
+Release: 1%{?dist}
+
+Summary: Improved builder for Docker images
+Group: Development/Tools
+License: BSD
+URL: https://github.com/DBuildService/dock
+Source0: https://github.com/%{owner}/%{project}/archive/%{commit}/%{project}-%{commit}.tar.gz
+
+BuildArch: noarch
+
+BuildRequires: python2-devel
+BuildRequires: python-setuptools
+
+%if 0%{?with_python3}
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+%endif
+
+Requires: python-docker-py
+Requires: GitPython
+Requires: python-requests
+
+%description
+Simple python library with command line interface for building docker
+images. It contains a lot of helpful functions which you would
+probably implement if you started hooking docker into your
+infrastructure.
+
+
+%package koji
+Summary: Koji plugin for Dock
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: koji
+
+%description koji
+Koji plugin for Dock
+
+
+%if 0%{?with_python3}
+%package -n python3-dock
+Summary: Improved builder for Docker images
+Group: Development/Tools
+License: BSD
+Requires: python3-docker-py
+Requires: python3-requests
+# python3 build is missing for GitPython
+Requires: GitPython
+
+%description -n python3-dock
+Simple python library with command line interface for building docker
+images. It contains a lot of helpful functions which you would
+probably implement if you started hooking docker into your
+infrastructure.
+
+
+%package -n python3-dock-koji
+Summary: Koji plugin for Dock
+Group: Development/Tools
+Requires: python3-dock = %{version}-%{release}
+Requires: koji
+
+%description -n python3-dock-koji
+Koji plugin for Dock
+%endif # with_python3
+
+
+%prep
+%setup -qn %{name}-%{commit}
+%if 0%{?with_python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+%endif # with_python3
+
+
+%build
+# build python package
+%{__python} setup.py build
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with_python3
+
+%install
+mkdir -vp %{buildroot}/%{_datadir}/%{name}
+# install python package
+%{__python} setup.py install --skip-build --root %{buildroot}
+# ship dock in form of tarball so it can be installed within build image
+cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
+%if 0%{?with_python3}
+pushd %{py3dir}
+%{__python3} setup.py install --skip-build --root %{buildroot}
+popd
+%endif # with_python3
+
+%files
+%doc README.md
+%license LICENSE
+%{_bindir}/dock
+%dir %{python2_sitelib}/dock
+%{python2_sitelib}/dock/*.*
+%{python2_sitelib}/dock/cli
+%{python2_sitelib}/dock/plugins
+%exclude %{python2_sitelib}/dock/plugins/pre_koji.py*
+%{python2_sitelib}/dock-%{version}-py2.*.egg-info
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/dock.tar.gz
+%{_datadir}/%{name}/images
+
+
+%files koji
+%{python2_sitelib}/dock/plugins/pre_koji.py*
+
+
+%if 0%{?with_python3}
+%files -n python3-dock
+%doc README.md
+%license LICENSE
+%{_bindir}/dock
+%dir %{python3_sitelib}/dock
+%{python3_sitelib}/dock/*.*
+%{python3_sitelib}/dock/cli
+%{python3_sitelib}/dock/plugins
+%exclude %{python3_sitelib}/dock/plugins/pre_koji.py*
+%{python3_sitelib}/dock-%{version}-py2.*.egg-info
+%dir %{_datadir}/%{name}
+# ship dock in form of tarball so it can be installed within build image
+%{_datadir}/%{name}/dock.tar.gz
+# dockerfiles for build images
+# there is also a script which starts docker in privileged container
+# (is not executable, because it's meant to be used within provileged containers, not on a host system)
+%{_datadir}/%{name}/images
+
+
+%files -n python3-dock-koji
+%{python3_sitelib}/dock/plugins/pre_koji.py*
+%endif # with_python3
+
+
+%changelog
+* Fri Feb 20 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.1.0-1
+- new upstream release 1.1.0
+
+* Wed Feb 11 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.0.0-2
+- spec: fix python 3 packaging
+- fix license in %%files
+- comment on weird stuff (dock.tar.gz, docker.sh)
+
+* Thu Feb 05 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.0.0-1
+- initial 1.0.0 upstream release
+
+* Wed Feb 04 2015 Tomas Tomecek <ttomecek at redhat.com> 1.0.0.b-1
+- new upstream release: beta
+
+* Mon Dec 01 2014 Tomas Tomecek <ttomecek at redhat.com> 1.0.0.a-1
+- complete rewrite (ttomecek at redhat.com)
+- Use inspect_image() instead of get_image() when checking for existence (#4).
+ (twaugh at redhat.com)
+
+* Mon Nov 10 2014 Tomas Tomecek <ttomecek at redhat.com> 0.0.2-1
+- more friendly error msg when build img doesnt exist (ttomecek at redhat.com)
+- implement postbuild plugin system; do rpm -qa plugin (ttomecek at redhat.com)
+- core, logs: wait for container to finish and then gather output
+ (ttomecek at redhat.com)
+- core, df copying: df was not copied when path wasn't provided
+ (ttomecek at redhat.com)
+- store dockerfile in results dir (ttomecek at redhat.com)
+
+* Mon Nov 03 2014 Jakub Dorňák <jdornak at redhat.com> 0.0.1-1
+- new package built with tito
+
+* Sun Nov 2 2014 Jakub Dorňák <jdornak at redhat.com> - 0.0.1-1
+- Initial package
+
diff --git a/sources b/sources
index e69de29..6a871f6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b688011a9c4e74ffd37f61022e2cca99 dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
--
cgit v0.10.2
>From 138eb545dfbb09c71bfcecb9f6052f4362534a63 Mon Sep 17 00:00:00 2001
From: Martin Milata <mmilata at srck.net>
Date: Thu, 2 Apr 2015 17:28:56 +0200
Subject: new upstream release 1.1.2
diff --git a/.gitignore b/.gitignore
index 60b3ef2..74626b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
+/dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
diff --git a/dock.spec b/dock.spec
index 608b82b..b3ededf 100644
--- a/dock.spec
+++ b/dock.spec
@@ -3,11 +3,11 @@
%global owner DBuildService
%global project dock
-%global commit 4bd2f17017a62184d43da1bb689110c9562b0956
+%global commit 83b187ecc4b19ef993038e0459c69264b9b4a5c3
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: dock
-Version: 1.1.0
+Version: 1.1.2
Release: 1%{?dist}
Summary: Improved builder for Docker images
@@ -93,18 +93,21 @@ pushd %{py3dir}
popd
%endif # with_python3
+
%install
-mkdir -vp %{buildroot}/%{_datadir}/%{name}
-# install python package
-%{__python} setup.py install --skip-build --root %{buildroot}
-# ship dock in form of tarball so it can be installed within build image
-cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install --skip-build --root %{buildroot}
+mv %{buildroot}%{_bindir}/dock %{buildroot}%{_bindir}/dock3
popd
%endif # with_python3
+%{__python} setup.py install --skip-build --root %{buildroot}
+
+# ship dock in form of tarball so it can be installed within build image
+cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
+
+
%files
%doc README.md
%license LICENSE
@@ -128,7 +131,7 @@ popd
%files -n python3-dock
%doc README.md
%license LICENSE
-%{_bindir}/dock
+%{_bindir}/dock3
%dir %{python3_sitelib}/dock
%{python3_sitelib}/dock/*.*
%{python3_sitelib}/dock/cli
@@ -150,6 +153,15 @@ popd
%changelog
+* Thu Apr 02 2015 Martin Milata <mmilata at redhat.com> - 1.1.2-1
+- new upstream release 1.1.2
+
+* Thu Mar 19 2015 Jiri Popelka <jpopelka at redhat.com> - 1.1.1-2
+- separate executable for python 3
+
+* Tue Mar 17 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.1.1-1
+- new upstream release 1.1.1
+
* Fri Feb 20 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.1.0-1
- new upstream release 1.1.0
diff --git a/sources b/sources
index 6a871f6..bda3fba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b688011a9c4e74ffd37f61022e2cca99 dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
+f20e64e5bedcd613d42aa0f6a02ffbc3 dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
--
cgit v0.10.2
>From 9c232ce6246e199d59c8dca522e6fdafc137eb1b Mon Sep 17 00:00:00 2001
From: Tomas Tomecek <ttomecek at redhat.com>
Date: Tue, 21 Apr 2015 17:03:39 +0200
Subject: new upstream release 1.2.0
diff --git a/.gitignore b/.gitignore
index 74626b1..45b1321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/dock-4bd2f17017a62184d43da1bb689110c9562b0956.tar.gz
/dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
+/dock-0dc913b1657d6f47ea5959a24d3afeb15518f3a7.tar.gz
diff --git a/dock.spec b/dock.spec
index b3ededf..0c183a6 100644
--- a/dock.spec
+++ b/dock.spec
@@ -3,11 +3,11 @@
%global owner DBuildService
%global project dock
-%global commit 83b187ecc4b19ef993038e0459c69264b9b4a5c3
+%global commit 0dc913b1657d6f47ea5959a24d3afeb15518f3a7
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: dock
-Version: 1.1.2
+Version: 1.2.0
Release: 1%{?dist}
Summary: Improved builder for Docker images
@@ -153,6 +153,9 @@ cp -a %{sources} %{buildroot}/%{_datadir}/%{name}/dock.tar.gz
%changelog
+* Tue Apr 21 2015 Tomas Tomecek <ttomecek at redhat.com> - 1.2.0-1
+- new upstream release 1.2.0
+
* Thu Apr 02 2015 Martin Milata <mmilata at redhat.com> - 1.1.2-1
- new upstream release 1.1.2
diff --git a/sources b/sources
index bda3fba..75ad309 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f20e64e5bedcd613d42aa0f6a02ffbc3 dock-83b187ecc4b19ef993038e0459c69264b9b4a5c3.tar.gz
+82706f54b6ef548838c4e7582b5c5b11 dock-0dc913b1657d6f47ea5959a24d3afeb15518f3a7.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dock.git/commit/?h=f21&id=d82e79bb826eb4c3a8b13aa440b1773f2fbdd242
More information about the scm-commits
mailing list