[docker-registry] Resolves: rhbz#1130008 - update to 0.8.1
lsm5
lsm5 at fedoraproject.org
Tue Sep 2 23:55:23 UTC 2014
commit 4c2e4a6279530b1c7898655cb3b3177d70500ac8
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Tue Sep 2 18:55:08 2014 -0500
Resolves: rhbz#1130008 - update to 0.8.1
.gitignore | 1 +
...se-flask-cors-not-available-in-Fedora-yet.patch | 75 --------------------
docker-registry.service | 4 +-
docker-registry.spec | 63 ++++++++++-------
docker-registry.sysconfig | 4 +-
sources | 2 +-
6 files changed, 43 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 921dff7..10359b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/0.6.8.tar.gz
/0.7.1.tar.gz
/0.7.3.tar.gz
+/0.8.1.tar.gz
diff --git a/docker-registry.service b/docker-registry.service
index cdc8d89..394bc0f 100644
--- a/docker-registry.service
+++ b/docker-registry.service
@@ -1,14 +1,12 @@
[Unit]
Description=Registry server for Docker
-After=docker.service
-Requires=docker.service
[Service]
Type=simple
Environment=DOCKER_REGISTRY_CONFIG=/etc/docker-registry.yml
EnvironmentFile=-/etc/sysconfig/docker-registry
WorkingDirectory=#WORKDIR#
-ExecStart=/usr/bin/docker run -p 5000:5000 registry
+ExecStart=/usr/bin/gunicorn --access-logfile - --debug --max-requests 100 --graceful-timeout 3600 -t 3600 -k gevent -b ${REGISTRY_ADDRESS}:${REGISTRY_PORT} -w $GUNICORN_WORKERS docker_registry.wsgi:application
Restart=on-failure
[Install]
diff --git a/docker-registry.spec b/docker-registry.spec
index 9be1ce6..32905ff 100644
--- a/docker-registry.spec
+++ b/docker-registry.spec
@@ -7,7 +7,7 @@
Summary: Registry server for Docker
Name: docker-registry
-Version: 0.7.3
+Version: 0.8.1
Release: 1%{?dist}
License: ASL 2.0
URL: https://github.com/dotcloud/%{name}
@@ -16,8 +16,6 @@ Source1: docker-registry.service
Source2: docker-registry.sysconfig
Source3: docker-registry.sysvinit
-Patch1: Don-t-use-flask-cors-not-available-in-Fedora-yet.patch
-
BuildRequires: python2-devel
%if %{with systemd}
BuildRequires: systemd
@@ -30,8 +28,18 @@ Requires(preun): chkconfig
Requires(postun): initscripts
Requires: python-importlib
%endif
-Requires: docker-io
-BuildArch: noarch
+
+Requires: python-flask
+Requires: python-docker-registry-core
+Requires: PyYAML
+Requires: python-requests
+Requires: python-gunicorn
+Requires: python-gevent
+Requires: python-blinker
+Requires: python-rsa
+Requires: python-backports-lzma
+Requires: python-sqlalchemy
+BuildArch: noarch
%description
Registry server for Docker (hosting/delivering of repositories and images).
@@ -43,8 +51,6 @@ Registry server for Docker (hosting/delivering of repositories and images).
# It's not the main one (yet?)
rm -rf contrib/golang_impl
-%patch1 -p1
-
%build
%{__python} setup.py build
@@ -53,28 +59,23 @@ install -d %{buildroot}%{_sysconfdir}/sysconfig
install -d %{buildroot}%{_sharedstatedir}/%{name}
install -d %{buildroot}%{python_sitelib}/%{name}
-install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
%if %{with systemd}
install -d %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+install -pm 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
# Make sure we set proper WorkingDir in the systemd service file
sed -i "s|#WORKDIR#|%{python_sitelib}/%{name}|" %{buildroot}%{_unitdir}/%{name}.service
%else
install -d %{buildroot}%{_initddir}
-install -p -m 755 %{SOURCE3} %{buildroot}%{_initddir}/%{name}
-# Make sure we set proper wrking dir in the sysvinit file
+install -pm 755 %{SOURCE3} %{buildroot}%{_initddir}/%{name}
+# Make sure we set proper working dir in the sysvinit file
sed -i "s|#WORKDIR#|%{python_sitelib}/%{name}|" %{buildroot}%{_initddir}/%{name}
%endif
-cp -r docker_registry tests %{buildroot}%{python_sitelib}/%{name}
+cp -pr docker_registry tests %{buildroot}%{python_sitelib}/%{name}
cp config/config_sample.yml %{buildroot}%{_sysconfdir}/%{name}.yml
-
-cp -r depends/docker-registry-core/docker_registry/* %{buildroot}%{python_sitelib}/%{name}/docker_registry/
-
-echo "local:
- storage: local
- storage_path: %{_sharedstatedir}/%{name}" >> %{buildroot}%{_sysconfdir}/%{name}.yml
+sed -i 's/\/tmp\/registry/\/var\/lib\/docker-registry/g' %{buildroot}%{_sysconfdir}/%{name}.yml
%post
%if %{with systemd}
@@ -104,6 +105,8 @@ fi
%files
%dir %{python_sitelib}/%{name}
+%dir %{python_sitelib}/%{name}/docker_registry
+%dir %{python_sitelib}/%{name}/tests
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.yml
%{python_sitelib}/%{name}/docker_registry/*.py
@@ -121,16 +124,23 @@ fi
%{python_sitelib}/%{name}/docker_registry/drivers/*.py
%{python_sitelib}/%{name}/docker_registry/drivers/*.pyc
%{python_sitelib}/%{name}/docker_registry/drivers/*.pyo
-%{python_sitelib}/%{name}/docker_registry/core/*.py
-%{python_sitelib}/%{name}/docker_registry/core/*.pyc
-%{python_sitelib}/%{name}/docker_registry/core/*.pyo
-%{python_sitelib}/%{name}/docker_registry/testing/*.py
-%{python_sitelib}/%{name}/docker_registry/testing/*.pyc
-%{python_sitelib}/%{name}/docker_registry/testing/*.pyo
+%{python_sitelib}/%{name}/docker_registry/server/*.py
+%{python_sitelib}/%{name}/docker_registry/server/*.pyc
+%{python_sitelib}/%{name}/docker_registry/server/*.pyo
%{python_sitelib}/%{name}/tests/*.py
%{python_sitelib}/%{name}/tests/*.pyc
%{python_sitelib}/%{name}/tests/*.pyo
-%{python_sitelib}/%{name}/tests/*.txt
+%{python_sitelib}/%{name}/tests/data/xattr/json
+%{python_sitelib}/%{name}/tests/data/xattr/layer.tar
+%{python_sitelib}/%{name}/tests/fixtures/test_config.yaml
+%{python_sitelib}/%{name}/tests/lib/*.py
+%{python_sitelib}/%{name}/tests/lib/*.pyc
+%{python_sitelib}/%{name}/tests/lib/*.pyo
+%{python_sitelib}/%{name}/tests/lib/index/*.py*
+%{python_sitelib}/%{name}/tests/data/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
+%{python_sitelib}/%{name}/tests/data/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
+%{python_sitelib}/%{name}/tests/data/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
+%{python_sitelib}/%{name}/tests/data/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
%dir %{_sharedstatedir}/%{name}
%doc LICENSE README.md
%if %{with systemd}
@@ -140,6 +150,9 @@ fi
%endif
%changelog
+* Tue Sep 02 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.8.1-1
+- Resolves: rhbz#1130008 - upstream release 0.8.1
+
* Mon Aug 11 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0.7.3-1
- Resolves: rhbz#1111813 - upstream release 0.7.3
- Resolves: rhbz#1120214 - unitfile doesn't use redis.service
diff --git a/docker-registry.sysconfig b/docker-registry.sysconfig
index 3f9374c..33eb95c 100644
--- a/docker-registry.sysconfig
+++ b/docker-registry.sysconfig
@@ -1,5 +1,5 @@
# The Docker registry configuration file
-# DOCKER_REGISTRY_CONFIG=/etc/docker-registry.yml
+DOCKER_REGISTRY_CONFIG=/etc/docker-registry.yml
# The configuration to use from DOCKER_REGISTRY_CONFIG file
SETTINGS_FLAVOR=local
@@ -11,4 +11,4 @@ REGISTRY_ADDRESS=0.0.0.0
REGISTRY_PORT=5000
# Number of workers to handle the connections
-GUNICORN_WORKERS=8
+GUNICORN_WORKERS=4
diff --git a/sources b/sources
index 01faffa..46a1523 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0425baed04cdf166df8334ccc846761 0.7.3.tar.gz
+0c635e74d138fb0fb3efcf26990b159b 0.8.1.tar.gz
More information about the scm-commits
mailing list