Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.
Merged

#401 #404

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Docker-registry


## 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

Major architecture rehaul, with potentially breaking changes:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/config_sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions depends/docker-registry-core/docker_registry/core/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
9 changes: 5 additions & 4 deletions docker_registry/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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('/')
Expand Down
4 changes: 3 additions & 1 deletion docker_registry/storage/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
1 change: 1 addition & 0 deletions tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# -*- coding: utf-8 -*-