Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NXP] Updating NXP docker img file to gather NXP SDKs in a single img #35651

Merged
merged 2 commits into from
Sep 20, 2024
Merged

[NXP] Updating NXP docker img file to gather NXP SDKs in a single img #35651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a02653f
[NXP] Updating NXP docker img file to gather NXP SDKs in a single img
chapongatien Sep 18, 2024
04df270
[NXP] Updating vscode docker img to remove unused nxp platforms
chapongatien Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
78 : [Silabs] Update Silabs docker WiseConnect 3.3.2
79 : [NXP] Updating NXP docker image to include k32w0 platform
7 changes: 6 additions & 1 deletion integrations/docker/images/stage-2/chip-build-nxp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ RUN set -x \

WORKDIR /opt/nxp/

ARG NXP_SDK_EXAMPLE_PATH=nxp_matter_support/github_sdk/common_sdk/repo/examples

RUN set -x \
&& git clone --branch v1.4.0-pvw1 https://github.com/NXP/nxp_matter_support.git \
&& pip3 install --break-system-packages -U --no-cache-dir west \
&& ./nxp_matter_support/scripts/update_nxp_sdk.py --platform common \
&& ./nxp_matter_support/scripts/update_nxp_sdk.py \
&& cd $NXP_SDK_EXAMPLE_PATH \
&& find . -maxdepth 1 -mindepth 1 -type d ! -name '.*' -a ! -name '*rt1170*' -a ! -name '*rt1060*' -a ! -name '*rw612*' -a ! -name '*k32w*' -a ! -name '*mcxw*' -exec rm -rf {} + `# Remove unused folder to reduce image size` \
&& : # last line

FROM ghcr.io/project-chip/chip-build:${VERSION}

COPY --from=build /opt/nxp/ /opt/nxp/

ENV NXP_SDK_PATH=/opt/nxp
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
10 changes: 1 addition & 9 deletions integrations/docker/images/vscode/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS psoc6
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen
FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba
FROM ghcr.io/project-chip/chip-build-k32w:${VERSION} AS k32w
FROM ghcr.io/project-chip/chip-build-rw61x:${VERSION} AS rw61x
FROM ghcr.io/project-chip/chip-build-nxp:${VERSION} AS nxp
FROM ghcr.io/project-chip/chip-build-nxp-zephyr:${VERSION} AS nxpzephyr
FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx
Expand Down Expand Up @@ -48,10 +46,6 @@ COPY --from=crosscompile /opt/ubuntu-22.04.1-aarch64-sysroot /opt/ubuntu-22.04.1

COPY --from=ameba /opt/ameba /opt/ameba

COPY --from=k32w /opt/sdk /opt/k32w

COPY --from=rw61x /opt/sdk /opt/nxp-sdk

COPY --from=nxp /opt/nxp /opt/nxp

COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.8/ /opt/nxp-zephyr/zephyr-sdk-0.16.8/
Expand Down Expand Up @@ -126,9 +120,6 @@ ENV IDF_TOOLS_PATH=/opt/espressif/tools
ENV IMX_SDK_ROOT=/opt/fsl-imx-xwayland/6.1-langdale
ENV JAVA_PATH=/usr/lib/jvm/java-8-openjdk-amd64
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
ENV NXP_K32W0_SDK_ROOT=/opt/k32w/core
ENV NXP_K32W1_SDK_ROOT=/opt/k32w/k32w1
ENV NXP_SDK_ROOT=/opt/nxp-sdk/rw61x
ENV OPENOCD_PATH=/opt/openocd/
ENV QEMU_ESP32=/opt/espressif/qemu/qemu-system-xtensa
ENV QEMU_ESP32_DIR=/opt/espressif/qemu
Expand All @@ -142,6 +133,7 @@ ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.8
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
ENV NXP_SDK_PATH=/opt/nxp

# Places bootstrap files there instead of the default one which is `.environment`.
# NOTE: This directory is NOT persistent.
Expand Down
Loading