@@ -17,7 +17,7 @@ sed -i 's/main$/main universe/' /etc/apt/sources.list
1717# install required packages (copied from dotcloud/docker-registry Dockerfile)
1818apt-get update && \
1919 apt-get install -y git-core build-essential python-dev \
20- libevent-dev python-openssl liblzma-dev
20+ libevent-dev libssl-dev libyaml-0-2 libyaml-dev python-openssl liblzma-dev swig
2121
2222# install pip
2323curl -sSL https://raw.githubusercontent.com/pypa/pip/6.0.8/contrib/get-pip.py | python -
@@ -26,9 +26,7 @@ curl -sSL https://raw.githubusercontent.com/pypa/pip/6.0.8/contrib/get-pip.py |
2626useradd -s /bin/bash registry
2727
2828# add the docker registry source from github
29- git clone https://github.com/deis/docker-registry /docker-registry && \
30- cd /docker-registry && \
31- git checkout 258398d && \
29+ git clone -b new-repository-import-v091 --single-branch https://github.com/deis/docker-registry /docker-registry && \
3230 chown -R registry:registry /docker-registry
3331
3432# install boto configuration
@@ -41,9 +39,13 @@ pip install /docker-registry/depends/docker-registry-core
4139# Install registry
4240pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]
4341
42+ patch \
43+ $( python -c ' import boto; import os; print os.path.dirname(boto.__file__)' ) /connection.py \
44+ < /docker-registry/contrib/boto_header_patch.diff
45+
4446# cleanup. indicate that python is a required package.
45- apt-mark unmarkauto python python-openssl && \
46- apt-get remove -y --purge git-core build-essential python-dev && \
47+ apt-mark unmarkauto python python-openssl libyaml-0-2 && \
48+ apt-get remove -y --purge git-core build-essential libssl-dev libyaml-dev python-dev swig && \
4749 apt-get autoremove -y --purge && \
4850 apt-get clean -y && \
4951 rm -Rf /usr/share/man /usr/share/doc && \
0 commit comments