From 78dd31170982b9a232213fc4456d6670d2784207 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Wed, 20 Jul 2016 16:10:18 -0600 Subject: [PATCH] Revert "fix(registry): use the proxy port and local host to connect to registry" This reverts the commit becccab5f94443eea86253c035b4f1e985370cda. --- README.md | 2 ++ rootfs/api/settings/production.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef6e989a6..32083a00f 100644 --- 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 index a0fde28f3..ac30bd1af 100644 --- 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