Updating docker image to use zephyr sdk v0.17.3

Author: BujSet

samples/modules/executorch/arm-fvp-tutorials/Dockerfile.armfvp_zephyr

@@ -106,52 +106,18 @@ RUN cd /home/zephyruser/ && wget https://apt.kitware.com/kitware-archive.sh && \
 USER zephyruser
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
  cd /home/zephyruser/ && \
- python3 -m venv .venv && \
- source .venv/bin/activate && \
- python3 -m pip install --upgrade pip && \
- wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/zephyr-sdk-0.17.2_linux-x86_64.tar.xz && \
- tar -xf zephyr-sdk-0.17.2_linux-x86_64.tar.xz && \
- rm -f zephyr-sdk-0.17.2_linux-x86_64.tar.xz && \
- cd zephyr-sdk-0.17.2/ && \
- ./setup.sh -c -t arm-zephyr-eabi; \
+ wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.3/zephyr-sdk-0.17.3_linux-x86_64.tar.xz && \
+ tar -xf zephyr-sdk-0.17.3_linux-x86_64.tar.xz && \
+ rm -f zephyr-sdk-0.17.3_linux-x86_64.tar.xz; \
 fi
 
 RUN if [ "$TARGETARCH" = "arm64" ]; then \
  cd /home/zephyruser/ && \
- python3 -m venv .venv && \
- source .venv/bin/activate && \
- python3 -m pip install --upgrade pip && \
- wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.2/zephyr-sdk-0.17.2_linux-aarch64.tar.xz && \
- tar -xf zephyr-sdk-0.17.2_linux-aarch64.tar.xz && \
- rm -f zephyr-sdk-0.17.2_linux-aarch64.tar.xz && \
- cd zephyr-sdk-0.17.2/ && \
- ./setup.sh -c -t arm-zephyr-eabi; \
+ wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.3/zephyr-sdk-0.17.3_linux-aarch64.tar.xz && \
+ tar -xf zephyr-sdk-0.17.3_linux-aarch64.tar.xz && \
+ rm -f zephyr-sdk-0.17.3_linux-aarch64.tar.xz; \
 fi
 
-USER zephyruser
-RUN cd /home/zephyruser/ && \
- source .venv/bin/activate && \
- pip install west
-
-RUN cd /home/zephyruser/ && \
- source .venv/bin/activate && \
- git clone https://github.com/BujSet/zephyr.git && \
- cd zephyr/ && \
- git switch -c executorch-module-integration origin/executorch-module-integration
-
-RUN cd /home/zephyruser/ && \
- source .venv/bin/activate && \
- python3 -m pip install --upgrade pip && \
- python3 -m pip install west torch numpy && \
- python3 -m pip install -r zephyr/scripts/requirements.txt
-
-RUN cd /home/zephyruser/ && \
- source .venv/bin/activate && \
- west init -l zephyr && \
- west config manifest.project-filter -- +executorch && \
- west -v update && \
- source zephyr/zephyr-env.sh
-
 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 ENV ZEPHYR_SDK_INSTALL_DIR=/home/zephyruser/zephyr-sdk-0.16.0
 USER zephyruser

samples/modules/executorch/arm-fvp-tutorials/README.md

@@ -13,14 +13,15 @@ Requires docker to be installed. While the CLI is sufficient to complete this tu
 You can copy-paste the commands below to setup up and validate a working flow. Start the docker image with the following command:
 
 ```
-docker run -it --entrypoint /bin/bash --net=host -w /home/zephyruser/ rselagam/zephyr-armfvp:v8
+docker run -it --entrypoint /bin/bash --net=host -w /home/zephyruser/ rselagam/zephyr-armfvp:v11
 ```
 
 Once in the docker image, run the following commands to set up environment and executorch module of zephyr. Please note that you should replace `<YOUR EMAL>` and `<YOUR USER NAME>` with appropriate GitHub credentials:
 
 ```
 git config --global user.email "<YOUR EMAIL>" && \
 git config --global user.name "<YOUR USER NAME>"
+./zephyr-sdk-0.17.3/setup.sh -c -t arm-zephyr-eabi
 git clone https://github.com/BujSet/zephyr.git
 cd zephyr/
 git switch -c executorch-module-integration origin/executorch-module-integration
@@ -52,7 +53,7 @@ Its strongly recommended to use the docker image paired with this tutorial. You
 ## Pulling the container
 
 ```
-docker pull rselagam/zephyr-armfvp:v8
+docker pull rselagam/zephyr-armfvp:v11
 ```
 
 ## Starting the docker image
@@ -63,13 +64,13 @@ It's often advantageous to map a shared volume between the hsot machine and the
 ### Linux/macOS
 
 ```
-docker run -it --entrypoint /bin/bash --net=host -v "$(pwd)"/workspace:/workspace -w /home/zephyruser/ rselagam/zephyr-armfvp:v8
+docker run -it --entrypoint /bin/bash --net=host -v "$(pwd)"/workspace:/workspace -w /home/zephyruser/ rselagam/zephyr-armfvp:v11
 ```
 
 ### Windows (PowerShell)
 
 ```
-docker run -it --entrypoint /bin/bash --net=host -v "${PWD}\workspace:/workspace" -w /home/zephyruser/ rselagam/zephyr-armfvp:v8
+docker run -it --entrypoint /bin/bash --net=host -v "${PWD}\workspace:/workspace" -w /home/zephyruser/ rselagam/zephyr-armfvp:v11
 ```
 
 # Working inside the Docker image
@@ -83,6 +84,7 @@ git clone https://github.com/BujSet/zephyr.git
 cd zephyr/
 git switch -c executorch-module-integration origin/executorch-module-integration
 cd ../
+./zephyr-sdk-0.17.3/setup.sh -c -t arm-zephyr-eabi
 west init -l zephyr
 west config manifest.project-filter -- +executorch
 west -v update
@@ -104,7 +106,6 @@ cd ~/modules/lib/executorch/
 source /home/zephyruser/modules/lib/executorch/examples/arm/ethos-u-scratch/setup_path.sh
 ```
 
-
 ### Setup West Build System
 
 ```