scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-09 12:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dax docker-compose (dc-up) which was broken by ServiceManager (#2356)

Browse source
This commit is contained in:
Travis Turner 2022-12-12 15:42:57 -06:00 • committed by GitHub
parent f2a13c8bde
commit e572c8f2c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dax/docker-compose.yml
View file

@ -8,9 +8,8 @@ services:
environment:
FEATUREBASE_BIND: 0.0.0.0:8080
FEATUREBASE_VERBOSE: "true"
FEATUREBASE_STORAGE_METHOD: boltdb
FEATUREBASE_STORAGE_DSN: file:/dax-data/mds.boldtb
FEATUREBASE_MDS_RUN: "true"
FEATUREBASE_CONFIG_DATA_DIR: file:/dax-data/mds
ports:
- "8081:8080"
@ -22,7 +21,7 @@ services:
FEATUREBASE_BIND: 0.0.0.0:8080
FEATUREBASE_VERBOSE: "true"
FEATUREBASE_QUERYER_RUN: "true"
FEATUREBASE_QUERYER_CONFIG_MDS_ADDRESS: "mds:8080"
FEATUREBASE_QUERYER_CONFIG_MDS_ADDRESS: "mds:8080/mds"
depends_on:
- mds
ports:
@ -34,7 +33,7 @@ services:
dockerfile: ../Dockerfile-dax-quick
environment:
FEATUREBASE_COMPUTER_RUN: "true"
FEATUREBASE_COMPUTER_CONFIG_MDS_ADDRESS: "mds:8080"
FEATUREBASE_COMPUTER_CONFIG_MDS_ADDRESS: "mds:8080/mds"
FEATUREBASE_COMPUTER_CONFIG_DATA_DIR: /dax-data/computer
FEATUREBASE_BIND: 0.0.0.0:8080
FEATUREBASE_VERBOSE: "true"
@ -63,4 +62,4 @@ services:
GEN_USE_SHARD_TRANSACTIONAL_ENDPOINT: "true"
GEN_SOURCE: "custom"
GEN_TARGET: "mds"
GEN_MDS_ADDRESS: "mds:8080"
GEN_MDS_ADDRESS: "mds:8080/mds"

2
dax/server/server.go
View file

@ -309,7 +309,7 @@ func (m *Command) setupServices() error {
var mdsAddr dax.Address
if m.Config.Queryer.Config.MDSAddress != "" {
mdsAddr = dax.Address(m.Config.Queryer.Config.MDSAddress + "/" + dax.ServicePrefixMDS)
mdsAddr = dax.Address(m.Config.Queryer.Config.MDSAddress)
} else if m.svcmgr.MDS != nil {
mdsAddr = m.svcmgr.MDS.Address()
} else {