deploy: add docker login

This commit also includes the required format changes to ensure that we
can push from docker compose. This means that we needed to update the
docker-compose.yml files to version 2.0
This commit is contained in:
Tom Gallacher 2016-10-20 16:58:09 +01:00
parent 57a1b28b27
commit 648caa4dd4
3 changed files with 69 additions and 63 deletions

View File

@ -16,6 +16,7 @@ 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

View File

@ -1,3 +1,5 @@
version: '2'
services:
#############################################################################
# CONSUL
#############################################################################
@ -22,6 +24,7 @@ consul:
# CloudAPI GraphQL
#############################################################################
cloudapi:
image: quay.io/yldio/joyent-dashboard-cloudapi-graphql
build: ./cloudapi-graphql
mem_limit: 128m
labels:

View File

@ -1,3 +1,5 @@
version: '2'
services:
consul:
extends:
file: docker-compose.yml
@ -8,8 +10,8 @@ cloudapi:
extends:
file: docker-compose.yml
service: cloudapi
links:
- consul:consul
depends_on:
- consul
environment:
- PORT=3000
- ROOT_URL=http://localhost:3000
@ -18,8 +20,8 @@ backend:
extends:
file: docker-compose.yml
service: backend
links:
- consul:consul
depends_on:
- consul
environment:
- PORT=8000
- ROOT_URL=http://localhost:8000