From 58cd713b37a868af98b7602cccbdda50e67a4dec Mon Sep 17 00:00:00 2001 From: Mason Tran Date: Wed, 7 Feb 2024 00:00:58 -0500 Subject: [PATCH] [script] remove openthread bootstrapping step --- Dockerfile | 3 --- script/bootstrap | 11 +---------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1321d87..50aa39c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update && \ && rm -rf /var/lib/apt/lists/* # Copy scripts -COPY ./openthread/script ./openthread/script COPY ./script/bootstrap \ ./script/bootstrap_silabs \ ./script/ @@ -21,8 +20,6 @@ COPY ./requirements.txt . # Bootstrap RUN ./script/bootstrap packages && rm -rf /var/lib/apt/lists/* -RUN ./script/bootstrap openthread && rm -rf /var/lib/apt/lists/* - # Label the build date before downloading slc to force slc to always be download during a docker build ARG BUILD_DATE LABEL build_date=${BUILD_DATE} diff --git a/script/bootstrap b/script/bootstrap index 295c9fcf..493bf703 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -125,12 +125,6 @@ install_packages() fi } -do_bootstrap_openthread() -{ - echo "Bootstrapping openthread" - "${repo_dir}"/openthread/script/bootstrap -} - do_bootstrap_silabs() { echo "Bootstrapping silabs" @@ -174,21 +168,18 @@ main() { if [ $# == 0 ]; then install_packages - do_bootstrap_openthread do_bootstrap_silabs elif [ "$1" == 'packages' ]; then install_packages elif [ "$1" == 'arm_toolchain' ]; then shift 1 install_arm_toolchain "$@" - elif [ "$1" == 'openthread' ]; then - do_bootstrap_openthread elif [ "$1" == 'python' ]; then install_packages_pip3 elif [ "$1" == 'silabs' ]; then do_bootstrap_silabs else - echo >&2 "Unsupported action: $1. Supported: openthread, silabs" + echo >&2 "Unsupported action: $1. Supported: packages, arm_toolchain, python, silabs" # 128 for Invalid arguments exit 128 fi