docker-registry: transition to plugin architecture

.gitignore

@@ -1,25 +1,2 @@
-*.log
-*.pot
+*~
 *.pyc
-*.sw[p-z]
-*.db
-.DS_Store
-.idea
-.dotcloud
-.coverage
-.tox
-htmlcov
-config/config.yml
-config/*.pem
-newrelic.ini
-reports
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-
-Vagrantfile
-.vagrant

Dockerfile

@@ -1,15 +1,17 @@
 FROM google/debian:wheezy
 
-ADD requirements.txt /docker-registry/requirements.txt
-ADD build.sh /docker-registry/build.sh
-RUN /docker-registry/build.sh
-ADD . /docker-registry
-RUN ln -s /docker-registry/config.yml /docker-registry/config/config.yml
+RUN apt-get update && apt-get install --no-install-recommends -yq python-pip build-essential python-dev liblzma-dev libffi-dev curl
+RUN pip install docker-registry==0.8.1
 
-# This is the default port that docker-registry is listening on.
-# Needs to be set into 5000 or the value of REGISTRY_PORT environment variable
-# if the latter one is set.
-EXPOSE 5000
+ADD requirements.txt /docker-registry-gcs-plugin/requirements.txt
+RUN pip install -r  /docker-registry-gcs-plugin/requirements.txt
+ADD setup.py /docker-registry-gcs-plugin/setup.py
+ADD docker_registry /docker-registry-gcs-plugin/docker_registry
+RUN pip install /docker-registry-gcs-plugin
+
+ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config.yml
+ADD config.yml /docker-registry/config/
+ADD run.sh /docker-registry/
 
 # Credentials. Use --volumes-from gcloud-config (google/cloud-sdk).
 VOLUME ["/.config"]
@@ -19,4 +21,8 @@ ENV OAUTH2_CLIENT_ID 32555940559.apps.googleusercontent.com
 ENV OAUTH2_CLIENT_SECRET ZmssLNjJy2998hD4CTg2ejr2
 ENV USER_AGENT "Cloud SDK Command Line Tool"
 
-CMD cd /docker-registry && ./setup-configs.sh && exec ./run.sh
+EXPOSE 5000
+
+ENV SETTINGS_FLAVOR prod
+WORKDIR /docker-registry
+ENTRYPOINT ["./run.sh"]

LICENSE

@@ -1,5 +1,4 @@
-
-                                 Apache License
+Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -179,15 +178,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

config.yml

@@ -1,9 +1,16 @@
-common:
-    boto_bucket: "_env:GCS_BUCKET"
-    oauth2: true
-    secret_key: "_env:SECRET_KEY"
+common: &common
+  loglevel: info
+  storage: gcs
+  oauth2: true
+  boto_bucket: "_env:GCS_BUCKET"
+  secret_key: "_env:SECRET_KEY"
+  storage_path: "_env:STORAGE_PATH:/"
+  standalone: true
 
 dev:
-    storage: gcs
-    loglevel: debug
-    storage_path: "_env:STORAGE_PATH:/"
+  <<: *common
+  loglevel: debug
+
+prod:
+  <<: *common
+  loglevel: warn