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:
parent
57a1b28b27
commit
648caa4dd4
@ -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
|
||||
|
@ -1,46 +1,49 @@
|
||||
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:
|
||||
build: ./cloudapi-graphql
|
||||
mem_limit: 128m
|
||||
labels:
|
||||
- triton.cns.services=cloudapi
|
||||
env_file: .env
|
||||
environment:
|
||||
- PORT=3000
|
||||
ports:
|
||||
- 3000:3000
|
||||
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
|
||||
#############################################################################
|
||||
# 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
|
||||
|
@ -1,26 +1,28 @@
|
||||
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
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user