[merge] pull request #1433

convox · Dec 6, 2016 · d18803c · d18803c
2 parents 5dfc24f + 7e798b2
commit d18803c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   web:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile
     command: api/bin/web
@@ -26,7 +26,6 @@ services:
       - PRIVATE
       - PROVIDER
       - RACK
-      - REGISTRY_HOST
       - RELEASE
       - ROLLBAR_TOKEN=f67f25b8a9024d5690f997bd86bf14b0
       - SECURITY_GROUP
@@ -45,7 +44,7 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
   monitor:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile
     command: api/bin/monitor
@@ -69,7 +68,6 @@ services:
       - PRIVATE
       - PROVIDER
       - RACK
-      - REGISTRY_HOST
       - RELEASE
       - ROLLBAR_TOKEN=f67f25b8a9024d5690f997bd86bf14b0
       - SECURITY_GROUP
@@ -82,12 +80,3 @@ services:
       - PROCESS=monitor
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-  registry:
-    environment:
-      - SETTINGS_FLAVOR=local
-      - PASSWORD
-      - LOG_GROUP
-      - PROCESS=registry
-    image: convox/registry
-    ports:
-      - 5000:443
diff --git a/provider/aws/dist/rack.json b/provider/aws/dist/rack.json
@@ -156,7 +156,7 @@
         { "Ref": "ExistingVpc" }
       ] }
     },
-    "VPCCIDR": {
+    "Vpccidr": {
       "Condition": "Development",
       "Value": { "Ref": "VPCCIDR" }
     }