From ed3a2e25266dfb53e132b5ab633a73fd561e3abb Mon Sep 17 00:00:00 2001 From: Tom Gallacher Date: Fri, 21 Oct 2016 11:50:37 +0100 Subject: [PATCH] Use captain to build images --- bin/deploy | 6 ++++-- docker-compose.yml | 4 ++-- local-compose.yml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/deploy b/bin/deploy index c6af10f8..d531a021 100755 --- a/bin/deploy +++ b/bin/deploy @@ -15,8 +15,10 @@ ensure_triton_cns_is_enabled get_triton_details write_env_file -docker-compose build -docker-compose push +docker login -e="." -u="$_DOCKER_LOGIN_USERNAME" -p="$_DOCKER_LOGIN_PASSWORD" $_DOCKER_REGISTRY +curl -sSL https://raw.githubusercontent.com/tomgco/captain/master/install.sh | bash +export PATH=$HOME/.captain/bin:$PATH +captain build -N yldio/joyent-dashboard- export DOCKER_HOST=$_DOCKER_HOST export DOCKER_CERT_PATH=$_DOCKER_CERT_PATH diff --git a/docker-compose.yml b/docker-compose.yml index 3b0a2499..35e7cef0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ consul: # CloudAPI GraphQL ############################################################################# cloudapi: - build: ./cloudapi-graphql + image: quay.io/yldio/joyent-dashboard-cloudapi-graphql mem_limit: 128m labels: - triton.cns.services=cloudapi @@ -35,7 +35,7 @@ cloudapi: # Frontend ############################################################################# backend: - build: ./backend + image: quay.io/yldio/joyent-dashboard-cloudapi-backend mem_limit: 128m labels: - triton.cns.services=backend diff --git a/local-compose.yml b/local-compose.yml index 284e7af9..650102b0 100644 --- a/local-compose.yml +++ b/local-compose.yml @@ -8,6 +8,7 @@ cloudapi: extends: file: docker-compose.yml service: cloudapi + build: ./cloudapi-graphql links: - consul:consul environment: