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

Commit 5f965db

Browse files
committed
Merge pull request #514 from docker/next-release
Preparing 0.8
2 parents 70ffe14 + 6a580a2 commit 5f965db

File tree

14 files changed

+39
-73
lines changed

14 files changed

+39
-73
lines changed

.dotcloudignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Docker-registry
22

3+
## 0.8.0
4+
5+
* configuration rehaul: https://github.com/docker/docker-registry/pull/444 - beware this breaks API for the drivers, and the core package has been updated accordingly to denote that
6+
* better redis error handling
7+
* improved coverage
8+
* experimental (undocumented) new-relic bundle support
9+
* bugsnag and new-relic are now installable as setup-tools "extras"
10+
* centralized version and other meta-informations
11+
* port / host and other gunicorn options are more consistent
12+
* mirroring fixes
13+
* tarfile: pax header and xattr support
14+
* some dependency requirements loosen (extras, test and style requirements)
15+
316
## 0.7.3
417

518
* [BUGFIX] fixed default value for standalone to true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ add ./config/boto.cfg /etc/boto.cfg
2525
run pip install /docker-registry/depends/docker-registry-core
2626

2727
# Install registry
28-
run pip install file:///docker-registry#egg=docker-registry[bugsnag]
28+
run pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic]
2929

3030
env DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
3131
env SETTINGS_FLAVOR dev

build.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker_registry/server/env.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
'GUNICORN_ACCESS_LOG_FILE': '"-"',
1616
'GUNICORN_ERROR_LOG_FILE': '"-"',
1717
'GUNICORN_OPTS': '[]',
18+
'NEW_RELIC_INI': '',
19+
'NEW_RELIC_STAGE': 'dev'
1820
}
1921

2022

docker_registry/wsgi.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
#!/usr/bin/env python
22
# -*- coding: utf-8 -*-
33

4+
from .server import env
45
import logging
56

6-
from .run import app
7-
from .server import env
7+
_new_relic_ini = env.source('NEW_RELIC_INI')
8+
if _new_relic_ini:
9+
try:
10+
import newrelic.agent
11+
newrelic.agent.initialize(
12+
_new_relic_ini,
13+
env.source('NEW_RELIC_STAGE'))
14+
except Exception as e:
15+
raise(Exception('Failed to init new relic agent %s' % e))
816

17+
from .run import app
918

1019
if __name__ == '__main__':
1120
# Bind to PORT if defined, otherwise default to 5000.

dotcloud.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

nginx.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

redis.conf

Lines changed: 0 additions & 2 deletions
This file was deleted.

requirements/style.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
hacking==0.8.1
1+
hacking>=0.8,<1.0

0 commit comments

Comments
 (0)