Skip to content

Commit

Permalink
add support for yugabytedb for devnet (#1756)
Browse files Browse the repository at this point in the history
* add support for yugabytedb for devnet

* add `make docker/yugabytedb`

* fixup
  • Loading branch information
nonsense authored Oct 16, 2023
1 parent 98bc75e commit ca4f6b5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,14 @@ docker/booster-bitswap:
DOCKER_BUILDKIT=1 $(docker_build_cmd) \
-t $(docker_user)/booster-bitswap-dev:dev --build-arg BUILD_VERSION=dev \
-f docker/devnet/Dockerfile.source --target booster-bitswap-dev .
docker/yugabytedb:
DOCKER_BUILDKIT=1 $(docker_build_cmd) \
-t $(docker_user)/yugabytedb:dev \
-f docker/Dockerfile.yugabyte .
.PHONY: docker/booster-http
.PHONY: docker/booster-bitswap
docker/all: $(lotus_build_cmd) $(boost_build_cmd) $(booster_http_build_cmd) $(booster_bitswap_build_cmd) \
docker/lotus docker/lotus-miner
docker/lotus docker/lotus-miner docker/yugabytedb
.PHONY: docker/all

### To allow devs to pull individual images. Require build_boost=0 and boost_version to be supplied
Expand Down
7 changes: 5 additions & 2 deletions docker/devnet/boost/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,14 @@ fi

## Override config options
echo Updating config values
sed 's|#ServiceApiInfo = ""|ServiceApiInfo = "ws://localhost:8042"|g' $BOOST_PATH/config.toml > $BOOST_PATH/config.toml.tmp; cp $BOOST_PATH/config.toml.tmp $BOOST_PATH/config.toml; rm $BOOST_PATH/config.toml.tmp
sed 's|#ServiceApiInfo = ""|ServiceApiInfo = "ws://localhost:8044"|g' $BOOST_PATH/config.toml > $BOOST_PATH/config.toml.tmp; cp $BOOST_PATH/config.toml.tmp $BOOST_PATH/config.toml; rm $BOOST_PATH/config.toml.tmp
sed 's|#ExpectedSealDuration = "24h0m0s"|ExpectedSealDuration = "0h0m10s"|g' $BOOST_PATH/config.toml > $BOOST_PATH/config.toml.tmp; cp $BOOST_PATH/config.toml.tmp $BOOST_PATH/config.toml; rm $BOOST_PATH/config.toml.tmp

## run boostd-data
boostd-data -vv run leveldb --repo=$BOOSTD_DATA_PATH --addr=0.0.0.0:8042 &>$BOOSTD_DATA_PATH/boostd-data.log &
#boostd-data -vv run leveldb --repo=$BOOSTD_DATA_PATH --addr=0.0.0.0:8044 &>$BOOSTD_DATA_PATH/boostd-data-ldb.log &

## run boostd-data for yugabytedb
boostd-data -vv run yugabyte --hosts yugabytedb --connect-string="postgresql://yugabyte:yugabyte@yugabytedb:5433?sslmode=disable" --addr 0.0.0.0:8044 &>$BOOSTD_DATA_PATH/boostd-data-yugabyte.log &

# TODO(anteva): fixme: hack as boostd fails to start without this dir
mkdir -p $BOOST_PATH/deal-staging
Expand Down
13 changes: 13 additions & 0 deletions docker/devnet/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,16 @@ services:
volumes:
- ./data/sample:/usr/share/nginx/html:ro

yugabytedb:
container_name: yugabytedb
image: filecoin/yugabytedb:dev
init: true
ports:
- "5433:5433"
- "9000:9000"
- "9042:9042"
restart: unless-stopped
logging: *default-logging
volumes:
- ./data/yugabytedb-data:/root/var/data
- ./data/yugabytedb-logs:/root/var/logs

0 comments on commit ca4f6b5

Please sign in to comment.