git.delta.rocks / unique-network / refs/commits / dfae29301c53

difftreelog

ci fix bdk dev paths

Yaroslav Bolyukin2023-09-08parent: #f266535.patch.diff
in: master

2 files changed

modified.baedeker/up.shdiffbeforeafterboth
--- a/.baedeker/up.sh
+++ b/.baedeker/up.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
 BDK_DIR=$(dirname $(readlink -f "$0"))
-RUST_LOG=info baedeker --spec=docker -J$BDK_DIR --generator=docker_compose=$BDK_DIR/.bdk-env --generator=docker_compose_discover=$BDK_DIR/.bdk-env/discover.env --secret=file=$BDK_DIR/.bdk-env/secret  --tla-str=relay_spec=rococo-local --input-modules='lib:baedeker-library/ops/nginx.libsonnet' --input-modules='lib:baedeker-library/ops/devtools.libsonnet' --tla-str=repoDir=$(realpath $BDK_DIR/..) $@ $BDK_DIR/rewrites.jsonnet
+RUST_LOG=info baedeker --spec=docker -J$BDK_DIR/vendor/ --generator=docker_compose=$BDK_DIR/.bdk-env --generator=docker_compose_discover=$BDK_DIR/.bdk-env/discover.env --secret=file=$BDK_DIR/.bdk-env/secret  --tla-str=relay_spec=rococo-local --input-modules='lib:baedeker-library/ops/nginx.libsonnet' --input-modules='lib:baedeker-library/ops/devtools.libsonnet' --tla-str=repoDir=$(realpath $BDK_DIR/..) $@ $BDK_DIR/rewrites.jsonnet
 cd $BDK_DIR/.bdk-env
 docker compose up -d --wait --remove-orphans
modified.envrcdiffbeforeafterboth
before · .envrc
1#!/bin/sh23# Load .envrc from parent directories4source_up_if_exists5# Common variables from .env6dotenv78RED='\033[0;31m'9GREEN='\033[0;32m'10RESET='\033[0m'1112dep_not_found=false13function check_bdk {14    if ! has $1; then15        echo -e "${RED}$1 not found (wanted for beadeker discovery)${RESET}"16        dep_not_found=true17    fi18}1920watch_file .baedeker/.bdk-env/discover.env21if test -f .baedeker/.bdk-env/discover.env; then22    check_bdk baedeker23    check_bdk docker24    check_bdk jq25    if $dep_not_found; then26        echo -e "${RED}Not performing bdk discovery${RESET}"27        exit 028    fi2930    echo -e "${GREEN}Baedeker env updated${RESET}"31    nginx_id=$(docker compose -f $PWD/.bdk-env/docker-compose.yml ps --format=json | jq -r '.[] | select(.Service == "nginx") | .ID' -e)32    if ! [ $? -eq 0 ]; then33        echo -e "${RED}Nginx container not found${RESET}"34        exit 035    fi36    nginx_ip=$(docker inspect $nginx_id | jq -r -e '.[0].NetworkSettings.Networks[].IPAddress')37    if ! [ $? -eq 0 ]; then38        echo -e "${RED}Nginx container network misconfigured?${RESET}"39        exit 040    fi41    tmpenv=$(mktemp)42    cat .baedeker/.bdk-env/discover.env | sed "s|BALANCER_URL|$nginx_ip|g" > $tmpenv43    dotenv $tmpenv44    echo -e "${GREEN}Enjoy your baedeker networks at $(echo $BDK_BALANCER || sed "s|BALANCER_URL|$nginx_ip|g")${RESET}"45fi