Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.
Merged
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
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ RUN pip install /docker-registry/depends/docker-registry-core
# Install registry
RUN pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]

RUN patch \
$(python -c 'import boto; import os; print os.path.dirname(boto.__file__)')/connection.py \
< /docker-registry/contrib/boto_header_patch.diff

ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
ENV SETTINGS_FLAVOR dev

Expand Down
11 changes: 11 additions & 0 deletions contrib/boto_header_patch.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/boto/connection.py
+++ b/boto/connection.py
@@ -381,7 +381,7 @@ class HTTPRequest(object):
if 'Content-Length' not in self.headers:
if 'Transfer-Encoding' not in self.headers or \
self.headers['Transfer-Encoding'] != 'chunked':
- self.headers['Content-Length'] = len(self.body)
+ self.headers['Content-Length'] = str(len(self.body))


class HTTPResponse(http_client.HTTPResponse):
3 changes: 2 additions & 1 deletion depends/docker-registry-core/requirements/main.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
boto==2.32.1
boto==2.34.0
redis==2.10.3
setuptools==5.8
simplejson==3.6.2
4 changes: 0 additions & 4 deletions depends/docker-registry-core/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
requirements_txt = open('./requirements/main.txt')
requirements = [line for line in requirements_txt]

# 2.6 native json raw_decode doesn't fit the bill, so add simple to our req
if ver < (2, 7):
requirements.insert(0, 'simplejson==3.6.2')

# Using this will relax dependencies to semver major matching
if 'DEPS' in os.environ and os.environ['DEPS'].lower() == 'loose':
loose = []
Expand Down