feat(registry): use store component for filesystem layers

fix(registry): fix S3 calling format

chore(registry): remove repositories data directory

fix(registry): bump log level back down to info

fix(registry): add boto_bucket option

chore(registry): bump commit sha to latest

fix(registry): bump to upstream, include repository-import functionality

Author: carmstrong

registry/Dockerfile

@@ -27,7 +27,7 @@ RUN useradd -s /bin/bash registry
 # add the docker registry source from github
 RUN git clone https://github.com/deis/docker-registry /docker-registry && \
     cd /docker-registry && \
-    git checkout f93804c && \
+    git checkout 94e7707 && \
     chown -R registry:registry /docker-registry
 
 # install boto configuration
@@ -38,16 +38,11 @@ RUN cd /docker-registry && pip install -r requirements/main.txt
 RUN pip install /docker-registry/depends/docker-registry-core
 
 # Install registry
-RUN pip install file:///docker-registry#egg=docker-registry[bugsnag]
+RUN pip install file:///docker-registry#egg=docker-registry[bugsnag,newrelic,cors]
 
 ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config.yml
 ENV SETTINGS_FLAVOR deis
 
-# create data volume
-RUN mkdir -p /data/repositories && chown -R registry:registry /data
-ENV STORAGE_PATH /data
-VOLUME /data
-
 # define the execution environment
 WORKDIR /app
 CMD ["/app/bin/boot"]

registry/bin/boot

@@ -18,6 +18,8 @@ export ETCD_TTL=${ETCD_TTL:-10}
 # run.sh requires $REGISTRY_PORT
 export REGISTRY_PORT=${PORT:-5000}
 
+export BUCKET_NAME=${BUCKET_NAME:-registry}
+
 # wait for etcd to be available
 until etcdctl --no-sync -C $ETCD ls >/dev/null 2>&1; do
 	echo "waiting for etcd at $ETCD..."
@@ -34,15 +36,16 @@ function etcd_set_default {
 # seed initial service configuration if necessary
 etcd_set_default protocol http
 etcd_set_default secretKey ${REGISTRY_SECRET_KEY:-`openssl rand -base64 64 | tr -d '\n'`}
+etcd_set_default bucketName ${BUCKET_NAME}
 
 # wait for confd to run once and install initial templates
 until confd -onetime -node $ETCD -config-file /app/confd.toml; do
 	echo "registry: waiting for confd to write initial templates..."
 	sleep $(($ETCD_TTL/2))  # sleep for half the TTL
 done
 
-# reset filesystem permissions for data container
-test -d /data && chown registry:registry /data
+# ensure registry bucket exists
+/app/bin/create_bucket ${BUCKET_NAME}
 
 # spawn the service in the background
 cd /docker-registry

registry/conf.d/config.toml

@@ -6,7 +6,8 @@ gid = 0
 mode  = "0644"
 keys = [
   "/deis/cache",
-  "/deis/registry"
+  "/deis/registry",
+  "/deis/store/gateway",
 ]
 check_cmd = "/app/bin/check {{ .src }}"
 reload_cmd = "/app/bin/reload"

registry/conf.d/create_bucket.toml

@@ -0,0 +1,9 @@
+[template]
+src   = "create_bucket"
+dest  = "/app/bin/create_bucket"
+uid = 0
+gid = 0
+mode  = "0755"
+keys = [
+  "/deis/store/gateway",
+]

registry/templates/config.yml

@@ -2,6 +2,8 @@
 common: &common
     # Default log level is info
     loglevel: _env:LOGLEVEL:info
+    # Enable the debugging /_versions endpoint
+    debug_versions: _env:DEBUG_VERSIONS:false
     # By default, the registry acts standalone (eg: doesn't query the index)
     standalone: _env:STANDALONE:true
     # The default endpoint to use (if NOT standalone) is index.docker.io
@@ -53,6 +55,20 @@ common: &common
     # Enable bugsnag (set the API key)
     bugsnag: _env:BUGSNAG
 
+    # CORS support is not enabled by default
+    cors:
+        origins: _env:CORS_ORIGINS:["null"]
+        methods: _env:CORS_METHODS
+        headers: _env:CORS_HEADERS:[Content-Type]
+        expose_headers: _env:CORS_EXPOSE_HEADERS
+        supports_credentials: _env:CORS_SUPPORTS_CREDENTIALS
+        max_age: _env:CORS_MAX_AGE
+        send_wildcard: _env:CORS_SEND_WILDCARD
+        always_send: _env:CORS_ALWAYS_SEND
+        automatic_options: _env:CORS_AUTOMATIC_OPTIONS
+        vary_header: _env:CORS_VARY_HEADER
+        resources: _env:CORS_RESOURCES
+
 local: &local
     <<: *common
     storage: local
@@ -71,6 +87,24 @@ s3: &s3
     s3_access_key: {{ or (.deis_registry_s3accessKey) "" }}
     s3_secret_key: {{ or (.deis_registry_s3secretKey) "" }}
 
+# Ceph Object Gateway Configuration
+# See http://ceph.com/docs/master/radosgw/ for details on installing this service.
+ceph-s3: &ceph-s3
+    <<: *common
+    storage: s3
+    s3_region: ~
+    s3_bucket: {{ .deis_registry_bucketName }}
+    s3_encrypt: false
+    s3_secure: false
+    storage_path: /registry
+    s3_access_key: {{ .deis_store_gateway_accessKey }}
+    s3_secret_key: {{ .deis_store_gateway_secretKey }}
+    boto_bucket: {{ .deis_registry_bucketName }}
+    boto_host: {{ .deis_store_gateway_host }}
+    boto_port: {{ .deis_store_gateway_port }}
+    boto_debug: 0
+    boto_calling_format: boto.s3.connection.OrdinaryCallingFormat
+
 # Google Cloud Storage Configuration
 # See:
 # https://developers.google.com/storage/docs/reference/v1/getting-startedv1#keys
@@ -139,8 +173,6 @@ elliptics:
     elliptics_logfile: _env:ELLIPTICS_LOGFILE:/dev/stderr
     elliptics_addr_family: _env:ELLIPTICS_ADDR_FAMILY:2
 
-
-
 # This is the default configuration when no flavor is specified
 dev: &dev
     <<: *local
@@ -164,5 +196,5 @@ prod:
 deis:
     {{ if .deis_registry_s3accessKey }}<<: *s3
     {{ else if .deis_registry_swiftAuthURL }} <<: *openstack-swift
-    {{ else }} <<: *local
+    {{ else }} <<: *ceph-s3
     {{ end }}

registry/templates/create_bucket

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+import boto
+import sys
+from boto.s3.connection import OrdinaryCallingFormat
+
+conn = boto.connect_s3(aws_access_key_id='{{ .deis_store_gateway_accessKey }}',
+                       aws_secret_access_key='{{ .deis_store_gateway_secretKey }}',
+                       host='{{ .deis_store_gateway_host }}',
+                       port={{ .deis_store_gateway_port }},
+                       is_secure=False,
+                       calling_format=OrdinaryCallingFormat(),
+                      )
+bucket = sys.argv[1]
+
+if not bucket in conn.get_all_buckets():
+  conn.create_bucket(bucket)