diff --git a/.baedeker/up.sh b/.baedeker/up.sh index 8a1c6121cf..695175405e 100755 --- 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 diff --git a/.envrc b/.envrc index 2c3c1cf7dc..4a55bd1518 100644 --- a/.envrc +++ b/.envrc @@ -28,7 +28,7 @@ if test -f .baedeker/.bdk-env/discover.env; then fi echo -e "${GREEN}Baedeker env updated${RESET}" - nginx_id=$(docker compose -f $PWD/.bdk-env/docker-compose.yml ps --format=json | jq -r '.[] | select(.Service == "nginx") | .ID' -e) + nginx_id=$(docker compose -f .baedeker/.bdk-env/docker-compose.yml ps --format=json | jq -r '.[] | select(.Service == "nginx") | .ID' -e) if ! [ $? -eq 0 ]; then echo -e "${RED}Nginx container not found${RESET}" exit 0