diff --git a/backend/build-dev.sh b/backend/build-dev.sh index cefbcbaa2..dcec8a6a9 100755 --- a/backend/build-dev.sh +++ b/backend/build-dev.sh @@ -8,7 +8,12 @@ if [ "$0" != "./build-dev.sh" ]; then exit 1 fi -alias 'rust-arm64-builder'='docker run --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64' +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + +alias 'rust-arm64-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-arm-cross:aarch64' cd .. rust-arm64-builder sh -c "(cd backend && cargo build)" diff --git a/backend/build-portable-dev.sh b/backend/build-portable-dev.sh index 4289dd3b7..e2161e226 100755 --- a/backend/build-portable-dev.sh +++ b/backend/build-portable-dev.sh @@ -8,7 +8,12 @@ if [ "$0" != "./build-portable-dev.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + +alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. rust-musl-builder sh -c "(cd backend && cargo +beta build --target=x86_64-unknown-linux-musl --no-default-features)" diff --git a/backend/build-portable.sh b/backend/build-portable.sh index ab43eb754..9f3cc9abf 100755 --- a/backend/build-portable.sh +++ b/backend/build-portable.sh @@ -8,7 +8,12 @@ if [ "$0" != "./build-portable.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + +alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:x86_64-musl' cd .. rust-musl-builder sh -c "(cd backend && cargo +beta build --release --target=x86_64-unknown-linux-musl --no-default-features)" diff --git a/backend/build-prod.sh b/backend/build-prod.sh index c9fb4ce5e..ff2c5c7a2 100755 --- a/backend/build-prod.sh +++ b/backend/build-prod.sh @@ -8,7 +8,12 @@ if [ "$0" != "./build-prod.sh" ]; then exit 1 fi -alias 'rust-arm64-builder'='docker run --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P start9/rust-arm-cross:aarch64' +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + +alias 'rust-arm64-builder'='docker run $USE_TTY --rm -v "$HOME/.cargo/registry":/root/.cargo/registry -v "$(pwd)":/home/rust/src -P start9/rust-arm-cross:aarch64' cd .. FLAGS="" diff --git a/system-images/compat/build.sh b/system-images/compat/build.sh index e7d937c7f..13b289531 100755 --- a/system-images/compat/build.sh +++ b/system-images/compat/build.sh @@ -8,7 +8,12 @@ if [ "$0" != "./build.sh" ]; then exit 1 fi -alias 'rust-musl-builder'='docker run --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:aarch64-musl' +USE_TTY= +if tty -s; then + USE_TTY="-it" +fi + +alias 'rust-musl-builder'='docker run $USE_TTY --rm -v "$HOME"/.cargo/registry:/root/.cargo/registry -v "$(pwd)":/home/rust/src start9/rust-musl-cross:aarch64-musl' cd ../../.. rust-musl-builder sh -c "(cd embassy-os/system-images/compat && cargo +beta build --release --target=aarch64-unknown-linux-musl --no-default-features)"