From 45edb136fee71c2e6ac4d06429340f34685164fa Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Mon, 2 Jun 2014 10:46:36 +0200 Subject: [PATCH 1/8] Remove non-sensical blindly copy-pasted comment Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- .../docker_registry/core/driver.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/depends/docker-registry-core/docker_registry/core/driver.py b/depends/docker-registry-core/docker_registry/core/driver.py index f3947b03d..85257abcb 100644 --- a/depends/docker-registry-core/docker_registry/core/driver.py +++ b/depends/docker-registry-core/docker_registry/core/driver.py @@ -214,19 +214,6 @@ def get_size(self, path): def fetch(name): - """The only public method you should access if you are not implementing - your own driver. - use this to get a backend - instance to which you can delegate actual requests. - - :param host: host name - :type host: unicode - :param port: port number - :type port: int - :param basepath: base path (will be prepended to actual requests) - :type basepath: unicode - :returns: a docker connection instance usable for the requested scheme - :rtype: DockerConnection - """ try: # XXX The noqa below is because of hacking being non-sensical on this module = __import__('docker_registry.drivers.%s' % name, globals(), From 63b79ba7383872e44fa78ec888b2c29f75f95984 Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Mon, 2 Jun 2014 10:46:49 +0200 Subject: [PATCH 2/8] Fix #401 Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- docker_registry/storage/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker_registry/storage/__init__.py b/docker_registry/storage/__init__.py index 4332f3cab..94d22a7a5 100644 --- a/docker_registry/storage/__init__.py +++ b/docker_registry/storage/__init__.py @@ -33,6 +33,8 @@ def load(kind=None): if kind in _storage: return _storage[kind] - _storage[kind] = engine.fetch(kind)(None, config=cfg) + _storage[kind] = engine.fetch(kind)( + path=cfg.get('storage_path'), + config=cfg) return _storage[kind] From 972dec024144ad0207b9d31bd5719f27a3533d6a Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Mon, 2 Jun 2014 11:08:06 +0200 Subject: [PATCH 3/8] Tentative fix for the travis build Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- config/config_sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config_sample.yml b/config/config_sample.yml index 8f8ac9f7e..a64995b50 100644 --- a/config/config_sample.yml +++ b/config/config_sample.yml @@ -132,7 +132,7 @@ dev: &dev # This flavor is automatically used by unit tests test: <<: *dev - storage_path: _env:STORAGE_PATH:/tmp/test + storage_path: _env:STORAGE_PATH:~/tmp/test # To specify another flavor, set the environment variable SETTINGS_FLAVOR # $ export SETTINGS_FLAVOR=prod From e1c97b55c09c3604f2b4388db452b18c0ed895f0 Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Mon, 2 Jun 2014 11:13:27 +0200 Subject: [PATCH 4/8] Bump the version to 0.7.1 Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- README.md | 2 +- docker_registry/app.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 28aebb032..a5292e3c7 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ As the documentation evolves with different registry versions, be sure that befo * check which version of the registry you are running * switch to the corresponding tag to access the README that matches your product version -The stable, released version is currently the [0.6.9 tag](https://github.com/dotcloud/docker-registry/tree/0.6.9). +The stable, released version is currently the [0.7.1 tag](https://github.com/dotcloud/docker-registry/tree/0.7.1). Quick start diff --git a/docker_registry/app.py b/docker_registry/app.py index f5beb6a4d..a6258e1c6 100644 --- a/docker_registry/app.py +++ b/docker_registry/app.py @@ -15,7 +15,7 @@ from . import toolkit from .lib import config -VERSION = '0.7.0' +VERSION = '0.7.1' app = flask.Flask('docker-registry') cfg = config.load() loglevel = getattr(logging, cfg.get('loglevel', 'INFO').upper()) diff --git a/setup.py b/setup.py index 6edecdd82..44a425a5a 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ # TODO: Load the version programatically, which is currently available in # docker_registry.app. This is not possible yet because importing # causes config files to be loaded - version='0.7.0', + version='0.7.1', description='Registry server for Docker', long_description=open('README.md').read(), namespace_packages=['docker_registry', 'docker_registry.drivers'], From 0d72b6ea80d4decb96557a85dd8d16d9d5cc9a78 Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Mon, 2 Jun 2014 11:22:43 +0200 Subject: [PATCH 5/8] Document changelog for 0.7.1 Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 898c3613e..3949e9d18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Docker-registry + +## 0.7.1 + + * [BUGFIX] storage_path is now handled correctly to the filesystem storage driver + ## 0.7 Major architecture rehaul, with potentially breaking changes: From 3b5c56b88e4f6ebf92d7be962295acf8206ca9cc Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Wed, 4 Jun 2014 03:42:20 +0200 Subject: [PATCH 6/8] Add bugfix desc Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3949e9d18..8ae8290bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ ## 0.7.1 * [BUGFIX] storage_path is now handled correctly to the filesystem storage driver + * [BUGFIX] change standalone header when in mirroring mode (prevents client from sending basic auth headers and overwriting token) ## 0.7 From 5ff133d6bc8506bb7e3804014688da149ef01268 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 May 2014 00:53:54 +0200 Subject: [PATCH 7/8] Change standalone header when in mirroring mode (prevents client from sending basic auth headers and overwriting token) Docker-DCO-1.1-Signed-off-by: Joffrey F (github: dmp42) --- docker_registry/app.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker_registry/app.py b/docker_registry/app.py index a6258e1c6..63d64576f 100644 --- a/docker_registry/app.py +++ b/docker_registry/app.py @@ -26,9 +26,10 @@ @app.route('/_ping') @app.route('/v1/_ping') def ping(): - return toolkit.response(headers={ - 'X-Docker-Registry-Standalone': cfg.standalone is not False - }) + headers = {'X-Docker-Registry-Standalone': cfg.standalone is not False} + if cfg.mirroring: + headers['X-Docker-Registry-Standalone'] = 'mirror' + return toolkit.response(headers=headers) @app.route('/') From f5d1ce4666ea659c0e956e2188dc0442bcb50c2c Mon Sep 17 00:00:00 2001 From: Mangled Deutz Date: Wed, 4 Jun 2014 03:48:48 +0200 Subject: [PATCH 8/8] Dull commit (hacking) Docker-DCO-1.1-Signed-off-by: Mangled Deutz (github: dmp42) --- tests/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..40a96afc6 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1 @@ +# -*- coding: utf-8 -*-