Fix #521

Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)

Author: Olivier Gambier

.gitignore

@@ -5,7 +5,6 @@
 *.db
 .DS_Store
 .idea
-.dotcloud
 .coverage
 .tox
 htmlcov

config/config_sample.yml

@@ -139,7 +139,7 @@ swift: &swift
     swift_region_name: _env:OS_REGION_NAME
 
 # This flavor stores the images in Glance (to integrate with openstack)
-# See also: https://github.com/dotcloud/openstack-docker
+# See also: https://github.com/docker/openstack-docker
 glance: &glance
     <<: *common
     storage: glance
@@ -185,7 +185,7 @@ dev: &dev
 # This flavor is used by unit tests
 test:
     <<: *dev
-    index_endpoint: https://indexstaging-docker.dotcloud.com
+    index_endpoint: https://registry-stage.hub.docker.com
     standalone: true
     storage_path: _env:STORAGE_PATH:./tmp/test
 

contrib/golang_impl/Dockerfile

@@ -9,7 +9,7 @@ env GOPATH  /go
 env CGO_ENABLED 0
 run cd /tmp && echo 'package main' > t.go && go test -a -i -v
 
-run git clone https://github.com/dotcloud/docker-registry.git /docker-registry.git
+run git clone https://github.com/docker/docker-registry.git /docker-registry.git
 run cd /docker-registry.git/contrib/golang_impl && make && cp bin/docker-registry /usr/local/bin/
 
 expose 80

contrib/golang_impl/README.md

@@ -10,7 +10,7 @@ This implementation doesn't provide all the features that are available in the P
 
 ## Build and start docker image for registry
 
-    $ git clone https://github.com/dotcloud/docker-registry.git docker-registry.git
+    $ git clone https://github.com/docker/docker-registry.git docker-registry.git
     $ cd docker-registry.git/contrib/golang_impl
     $ docker build -t docker_registry/golang .
     $ docker run -v /data:/data -d -p 80:80 docker_registry/golang

contrib/nginx/nginx_1-3-9.conf

@@ -24,7 +24,7 @@ server {
 
   client_max_body_size 0; # disable any limits to avoid HTTP 413 for large image uploads
 
-  # required to avoid HTTP 411: see Issue #1486 (https://github.com/dotcloud/docker/issues/1486)
+  # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486)
   chunked_transfer_encoding on;
 
   location / {

docker_registry/server/__init__.py

@@ -13,6 +13,6 @@
 __title__ = 'docker-registry'
 __build__ = 0x000000
 
-__url__ = 'https://github.com/dotcloud/docker-registry'
+__url__ = 'https://github.com/docker/docker-registry'
 __description__ = 'Registry server for Docker'
-__download__ = 'https://github.com/dotcloud/docker-registry/archive/master.zip'
+__download__ = 'https://github.com/docker/docker-registry/archive/master.zip'

scripts/bandwidth_parser.py

@@ -20,14 +20,14 @@
 logging_interval = 15  # 15 minutes
 exp_time = 60 * 60 * 24  # Key expires in 24hs
 try:
-    with open('/home/dotcloud/environment.json') as f:
+    with open('/home/docker/environment.json') as f:
         env = json.load(f)
         # Prod
         redis_opts = {
-            'host': env['DOTCLOUD_REDIS_REDIS_HOST'],
-            'port': int(env['DOTCLOUD_REDIS_REDIS_PORT']),
+            'host': env['REDIS_HOST'],
+            'port': int(env['REDIS_PORT']),
             'db': 1,
-            'password': env['DOTCLOUD_REDIS_REDIS_PASSWORD'],
+            'password': env['REDIS_PASSWORD'],
         }
 except Exception:
     # Dev

tests/workflow.py

@@ -1,7 +1,7 @@
 """
 How to run locally:
 Start your local registry:
-`INDEX_ENDPOINT=https://indexstaging-docker.dotcloud.com \
+`INDEX_ENDPOINT=https://registry-stage.hub.docker.com' \
  SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml docker-registry`
 
 Start the tests:
@@ -36,10 +36,10 @@ class TestWorkflow(base.TestCase):
     # Dev server needs to run on port 5000 in order to run this test
     registry_endpoint = os.environ.get(
         'DOCKER_REGISTRY_ENDPOINT',
-        'https://registrystaging-docker.dotcloud.com')
+        'https://registry-staging.docker.io')
     index_endpoint = os.environ.get(
         'DOCKER_INDEX_ENDPOINT',
-        'https://indexstaging-docker.dotcloud.com')
+        'https://registry-stage.hub.docker.com')
     user_credentials = os.environ['DOCKER_CREDS'].split(':')
 
     def generate_chunk(self, data):