From 04264931b506bd61f0a2b738e2bccedad8925c9f Mon Sep 17 00:00:00 2001
From: Tom Gallacher <tomgallacher23@gmail.com>
Date: Thu, 20 Oct 2016 17:47:37 +0100
Subject: [PATCH] Revert "deploy: add docker login"

This reverts commit 648caa4dd4a042a7d98418ecfbe47dd627316f2f.
---
 bin/deploy         |  1 -
 docker-compose.yml | 77 ++++++++++++++++++++++------------------------
 local-compose.yml  | 54 ++++++++++++++++----------------
 3 files changed, 63 insertions(+), 69 deletions(-)

diff --git a/bin/deploy b/bin/deploy
index 77c312b9..c6af10f8 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -16,7 +16,6 @@ get_triton_details
 write_env_file
 
 docker-compose build
-docker login -e="." -u="$_DOCKER_LOGIN_USERNAME" -p="$_DOCKER_LOGIN_PASSWORD" $_DOCKER_REGISTRY
 docker-compose push
 
 export DOCKER_HOST=$_DOCKER_HOST
diff --git a/docker-compose.yml b/docker-compose.yml
index ac6df31b..3b0a2499 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,49 +1,46 @@
-version: '2'
-services:
 #############################################################################
 #  CONSUL
 #############################################################################
-  consul:
-    image: progrium/consul:latest
-    labels:
-      - triton.cns.services=consul
-    restart: always
-    mem_limit: 128m
-    expose:
-      - 53
-      - 8300
-      - 8301
-      - 8302
-      - 8400
-      - 8500
-    env_file: .env
-    ports:
-      - 8500:8500
-    command: -server -bootstrap -ui-dir /ui
+consul:
+  image: progrium/consul:latest
+  labels:
+    - triton.cns.services=consul
+  restart: always
+  mem_limit: 128m
+  expose:
+    - 53
+    - 8300
+    - 8301
+    - 8302
+    - 8400
+    - 8500
+  env_file: .env
+  ports:
+    - 8500:8500
+  command: -server -bootstrap -ui-dir /ui
 #############################################################################
 #  CloudAPI GraphQL
 #############################################################################
-  cloudapi:
-    image: quay.io/yldio/joyent-dashboard-cloudapi-graphql
-    build: ./cloudapi-graphql
-    mem_limit: 128m
-    labels:
-      - triton.cns.services=cloudapi
-    env_file: .env
-    environment:
-      - PORT=3000
-    ports:
-      - 3000:3000
+cloudapi:
+  build: ./cloudapi-graphql
+  mem_limit: 128m
+  labels:
+    - triton.cns.services=cloudapi
+  env_file: .env
+  environment:
+    - PORT=3000
+  ports:
+    - 3000:3000
 #############################################################################
 #  Frontend
 #############################################################################
-  backend:
-    build: ./backend
-    mem_limit: 128m
-    labels:
-      - triton.cns.services=backend
-    env_file: .env
-    environment:
-      - PORT=8000
-    ports:
-      - 8000:8000
+backend:
+  build: ./backend
+  mem_limit: 128m
+  labels:
+    - triton.cns.services=backend
+  env_file: .env
+  environment:
+    - PORT=8000
+  ports:
+    - 8000:8000
diff --git a/local-compose.yml b/local-compose.yml
index 2e5b83fc..284e7af9 100644
--- a/local-compose.yml
+++ b/local-compose.yml
@@ -1,28 +1,26 @@
-version: '2'
-services:
-  consul:
-    extends:
-      file: docker-compose.yml
-      service: consul
-    ports:
-      - 8500:8500
-  cloudapi:
-    extends:
-      file: docker-compose.yml
-      service: cloudapi
-    depends_on:
-      - consul
-    environment:
-      - PORT=3000
-      - ROOT_URL=http://localhost:3000
-      - CONSUL=consul
-  backend:
-    extends:
-      file: docker-compose.yml
-      service: backend
-    depends_on:
-      - consul
-    environment:
-      - PORT=8000
-      - ROOT_URL=http://localhost:8000
-      - CONSUL=consul
+consul:
+  extends:
+    file: docker-compose.yml
+    service: consul
+  ports:
+    - 8500:8500
+cloudapi:
+  extends:
+    file: docker-compose.yml
+    service: cloudapi
+  links:
+    - consul:consul
+  environment:
+    - PORT=3000
+    - ROOT_URL=http://localhost:3000
+    - CONSUL=consul
+backend:
+  extends:
+    file: docker-compose.yml
+    service: backend
+  links:
+    - consul:consul
+  environment:
+    - PORT=8000
+    - ROOT_URL=http://localhost:8000
+    - CONSUL=consul