Merge pull request #901 from mboersma/revert-registry-proxy

Revert "fix(registry): use the proxy port and local host to connect t…
deis · Jul 20, 2016 · 4053e51 · 4053e51
2 parents 356683b + 78dd311
commit 4053e51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -37,6 +37,8 @@ The Deis project welcomes contributions from all developers. The high level proc
 
 In order to do development on this component, you'll need a working Kubernetes cluster. If you don't have one, follow the [installation instructions][install-k8s] and note that Controller currently targets version 1.2 and higher with the following requirements:
 
+* Docker's `insecure-registry` parameter must include the subnets used by your Kubernetes installation
+
 ### Helm Classic
 
 After you have a working Kubernetes cluster, install [helm classic](http://helm.sh) and run the following commands to add the Deis chart repository and install Deis to your new cluster:

diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py
@@ -280,8 +280,8 @@
 KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS = int(os.environ.get('KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS', 30))  # noqa
 
 # registry settings
-REGISTRY_HOST = "localhost"
-REGISTRY_PORT = os.environ.get('DEIS_REGISTRY_PROXY_PORT', 5555)
+REGISTRY_HOST = os.environ.get('DEIS_REGISTRY_SERVICE_HOST', '127.0.0.1')
+REGISTRY_PORT = os.environ.get('DEIS_REGISTRY_SERVICE_PORT', 5000)
 REGISTRY_URL = '{}:{}'.format(REGISTRY_HOST, REGISTRY_PORT)
 
 # logger settings