Skip to content

Commit 3884820

Browse files
authored
Add new common NXP dockerfile (#34947)
* [NXP][docker image] Add new common NXP docker image for next SDK version Signed-off-by: Martin Girardot <martin.girardot@nxp.com> * [NXP][docker image] remove k32w1 SDK clone as it will use common NXP SDK Signed-off-by: Martin Girardot <martin.girardot@nxp.com> --------- Signed-off-by: Martin Girardot <martin.girardot@nxp.com>
1 parent 1d2ddd4 commit 3884820

File tree

7 files changed

+31
-10
lines changed

7 files changed

+31
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
70 : [NXP] Update k32w1 SDK
1+
71 : [NXP] Update k32w1 SDK as it will use common NXP SDK

integrations/docker/images/stage-2/chip-build-k32w/Dockerfile

-9
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,8 @@ RUN set -x \
2626
&& cp -R examples/* core/boards && rm -rf examples \
2727
&& : # last line
2828

29-
WORKDIR /opt/k32w1_sdk
30-
31-
RUN set -x \
32-
&& west init -m https://github.com/nxp-mcuxpresso/mcux-sdk --mr "MCUX_2.16.000" \
33-
&& west update -o=--depth=1 -n -f smart \
34-
&& : # last line
35-
3629
FROM ghcr.io/project-chip/chip-build:${VERSION}
3730

3831
COPY --from=build /opt/sdk/ /opt/sdk/
39-
COPY --from=build /opt/k32w1_sdk/ /opt/k32w1_sdk/
4032

4133
ENV NXP_K32W0_SDK_ROOT=/opt/sdk/core
42-
ENV NXP_SDK_ROOT=/opt/k32w1_sdk
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
ARG VERSION=1
2+
FROM ghcr.io/project-chip/chip-build:${VERSION} AS build
3+
LABEL org.opencontainers.image.source=https://github.com/project-chip/connectedhomeip
4+
5+
RUN set -x \
6+
&& apt-get update \
7+
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
8+
xz-utils \
9+
&& : # last line
10+
11+
WORKDIR /opt/nxp/
12+
13+
RUN set -x \
14+
&& git clone --branch v1.4.0-pvw1 https://github.com/NXP/nxp_matter_support.git \
15+
&& pip3 install --break-system-packages -U --no-cache-dir west \
16+
&& ./nxp_matter_support/scripts/update_nxp_sdk.py --platform common \
17+
&& : # last line
18+
19+
FROM ghcr.io/project-chip/chip-build:${VERSION}
20+
21+
COPY --from=build /opt/nxp/ /opt/nxp/
22+
23+
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../build.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../run.sh
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../base/chip-build/version

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ FROM ghcr.io/project-chip/chip-build-crosscompile:${VERSION} AS crosscompile
1111
FROM ghcr.io/project-chip/chip-build-ameba:${VERSION} AS ameba
1212
FROM ghcr.io/project-chip/chip-build-k32w:${VERSION} AS k32w
1313
FROM ghcr.io/project-chip/chip-build-rw61x:${VERSION} AS rw61x
14+
FROM ghcr.io/project-chip/chip-build-nxp:${VERSION} AS nxp
1415
FROM ghcr.io/project-chip/chip-build-nxp-zephyr:${VERSION} AS nxpzephyr
1516
FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx
1617
FROM ghcr.io/project-chip/chip-build-ti:${VERSION} AS ti
@@ -51,6 +52,8 @@ COPY --from=k32w /opt/sdk /opt/k32w
5152

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

55+
COPY --from=nxp /opt/nxp /opt/nxp
56+
5457
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.5/ /opt/nxp-zephyr/zephyr-sdk-0.16.5/
5558
COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/
5659

@@ -139,6 +142,7 @@ ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5
139142
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
140143
ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr
141144
ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.5
145+
ENV NXP_UPDATE_SDK_SCRIPT_DOCKER=/opt/nxp/nxp_matter_support/scripts/update_nxp_sdk.py
142146

143147
ENV TIZEN_VERSION 7.0
144148
ENV TIZEN_SDK_ROOT /opt/tizen-sdk

0 commit comments

Comments
 (0)