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
1#!/bin/sh1#!/bin/sh
2set -e2set -e
3BDK_DIR=$(dirname $(readlink -f "$0"))3BDK_DIR=$(dirname $(readlink -f "$0"))
4RUST_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.jsonnet4RUST_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
5cd $BDK_DIR/.bdk-env5cd $BDK_DIR/.bdk-env
6docker compose up -d --wait --remove-orphans6docker compose up -d --wait --remove-orphans
77
modified.envrcdiffbeforeafterboth
--- a/.envrc
+++ b/.envrc
@@ -28,7 +28,7 @@
     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