Skip to content

Commit

Permalink
changed docker-compose to have yb-manager (#115)
Browse files Browse the repository at this point in the history
  • Loading branch information
kristinapathak authored Jul 28, 2020
1 parent cac4c1a commit c1c4d90
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
- Updated references to the main branch [#113](https://github.com/xmidt-org/codex-deploy/pull/113)
- Updated references to yb-manager in docker-compose [#114](https://github.com/xmidt-org/codex-deploy/pull/114)

## [v0.11.0]
- Separated out library packages, so only deploy and tests are left.
Expand Down
4 changes: 2 additions & 2 deletions deploy/docker-compose/docFiles/prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ scrape_configs:
target_label: __name__
replacement: "yugabyte_${1}"
static_configs:
- targets: ['yb-master-n1:7000']
- targets: ['yb-manager-n1:7000']
labels:
group: 'yb-master'
group: 'yb-manager'

- targets: ['yb-tserver-n1:9000']
labels:
Expand Down
12 changes: 6 additions & 6 deletions deploy/docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ services:
depends_on:
- yb-tserver

yb-master:
yb-manager:
image: yugabytedb/yugabyte:latest
container_name: yb-master-n1
container_name: yb-manager-n1
command: [ "/home/yugabyte/bin/yb-master",
"--fs_data_dirs=/mnt/disk0,/mnt/disk1",
"--master_addresses=yb-master-n1:7100",
"--master_addresses=yb-manager-n1:7100",
"--replication_factor=1"]
networks:
- back-tier
ports:
- "7111:7000"
environment:
SERVICE_7000_NAME: yb-master
SERVICE_7000_NAME: yb-manager

yb-tserver:
image: yugabytedb/yugabyte:latest
Expand All @@ -56,7 +56,7 @@ services:
- ./docFiles/create_db.cql:/create_db.cql
command: [ "/home/yugabyte/bin/yb-tserver",
"--fs_data_dirs=/mnt/disk0,/mnt/disk1",
"--tserver_master_addrs=yb-master-n1:7100"]
"--tserver_master_addrs=yb-manager-n1:7100"]
networks:
- back-tier
ports:
Expand All @@ -70,7 +70,7 @@ services:
SERVICE_6379_NAME: yedis
SERVICE_9000_NAME: yb-tserver
depends_on:
- yb-master
- yb-manager

prometheus:
image: prom/prometheus
Expand Down

0 comments on commit c1c4d90

Please sign in to comment.