Merge pull request #678 from chuegle/master

Changes to enable eu-central-1.

Author: dmp42

Dockerfile

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

contrib/boto_header_patch.diff

@@ -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):

depends/docker-registry-core/requirements/main.txt

@@ -1,3 +1,4 @@
-boto==2.32.1
+boto==2.34.0
 redis==2.10.3
 setuptools==5.8
+simplejson==3.6.2

depends/docker-registry-core/setup.py

@@ -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 = []