Use captain to build images

This commit is contained in:
Tom Gallacher 2016-10-21 11:50:37 +01:00
parent 04264931b5
commit ed3a2e2526
3 changed files with 7 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -8,6 +8,7 @@ cloudapi:
extends:
file: docker-compose.yml
service: cloudapi
build: ./cloudapi-graphql
links:
- consul:consul
environment: