diff --git a/core/Dockerfile b/core/Dockerfile index c3ada230c0..52b760ceb3 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -49,7 +49,6 @@ COPY run-service.sh /usr/bin/run-service # Copy binaries and necessary folders from downloadBinaries to this stage COPY --from=downloadBinaries \ /usr/bin/blueos_startup_update \ - /usr/bin/bridges \ /usr/bin/machineid-cli \ /usr/bin/mavlink2rest \ /usr/bin/mavlink-routerd \ @@ -88,6 +87,7 @@ RUN ln -s /root/.config/ardupilot-manager /shortcuts/ardupilot_logs RUN ln -s / /shortcuts/system_root RUN useradd -m -u 1000 -G dialout blueos RUN apt install -y sudo - +COPY tools/bridges/bridges /usr/bin/bridges +RUN chmod 777 /usr/bin/bridges # Start CMD /bin/bash -i /usr/bin/start-blueos-core && sleep infinity diff --git a/core/tools/bridges/bootstrap.sh b/core/tools/bridges/bootstrap.sh index fbc49cbaf1..4df74ecae8 100755 --- a/core/tools/bridges/bootstrap.sh +++ b/core/tools/bridges/bootstrap.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash -# Immediately exit on errors -set -e +# # Immediately exit on errors +# set -e -LOCAL_BINARY_PATH="/usr/bin/bridges" -VERSION=0.9.0 +# LOCAL_BINARY_PATH="/usr/bin/bridges" +# VERSION=0.9.0 -# By default we install armv7 -REMOTE_BINARY_URL="https://github.com/patrickelectric/bridges/releases/download/${VERSION}/bridges-armv7-unknown-linux-musleabihf" -if [[ "$(uname -m)" == "x86_64"* ]]; then - REMOTE_BINARY_URL="https://github.com/patrickelectric/bridges/releases/download/${VERSION}/bridges-x86_64-unknown-linux-musl" -fi +# # By default we install armv7 +# REMOTE_BINARY_URL="https://github.com/patrickelectric/bridges/releases/download/${VERSION}/bridges-armv7-unknown-linux-musleabihf" +# if [[ "$(uname -m)" == "x86_64"* ]]; then +# REMOTE_BINARY_URL="https://github.com/patrickelectric/bridges/releases/download/${VERSION}/bridges-x86_64-unknown-linux-musl" +# fi -wget "$REMOTE_BINARY_URL" -O "$LOCAL_BINARY_PATH" -chmod +x "$LOCAL_BINARY_PATH" +# wget "$REMOTE_BINARY_URL" -O "$LOCAL_BINARY_PATH" +# chmod +x "$LOCAL_BINARY_PATH" diff --git a/core/tools/bridges/bridges b/core/tools/bridges/bridges new file mode 100755 index 0000000000..d30916d051 Binary files /dev/null and b/core/tools/bridges/bridges differ