diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index d9a04eb8c7a142..4f960c555a5c61 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -62 : Fix ESP32 qemu build +63 : [NXP] Add docker image for Zephyr examples diff --git a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile new file mode 100644 index 00000000000000..67234af062eb6c --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/Dockerfile @@ -0,0 +1,32 @@ +ARG VERSION=1 +FROM ghcr.io/project-chip/chip-build:${VERSION} AS build +LABEL org.opencontainers.image.source=https://github.com/project-chip/connectedhomeip + +RUN set -x \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ + xz-utils \ + && : # last line + +WORKDIR /opt/nxp-zephyr +RUN set -x \ + && wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.5/zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \ + && tar xvf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \ + && rm -rf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \ + && zephyr-sdk-0.16.5/setup.sh -t arm-zephyr-eabi \ + && pip3 install -U --no-cache-dir west \ + && west init zephyrproject -m https://github.com/nxp-zephyr-ear/zephyr.git --mr zephyr_rw61x_v3.6_RFP \ + && cd zephyrproject/zephyr \ + && west update -o=--depth=1 -n \ + && west zephyr-export \ + && : # last line + +FROM ghcr.io/project-chip/chip-build:${VERSION} + +COPY --from=build /opt/nxp-zephyr/zephyr-sdk-0.16.5/ /opt/nxp-zephyr/zephyr-sdk-0.16.5/ +COPY --from=build /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/ + +WORKDIR /opt/nxp-zephyr + +ENV ZEPHYR_NXP_BASE=/opt/nxp-zephyr/zephyrproject/zephyr +ENV ZEPHYR_NXP_SDK_INSTALL_DIR=/opt/nxp-zephyr/zephyr-sdk-0.16.5 diff --git a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/build.sh b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/build.sh new file mode 120000 index 00000000000000..46b20313461454 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/build.sh @@ -0,0 +1 @@ +../../../build.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/run.sh b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/run.sh new file mode 120000 index 00000000000000..9bbfad86d46e50 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/run.sh @@ -0,0 +1 @@ +../../../run.sh \ No newline at end of file diff --git a/integrations/docker/images/stage-2/chip-build-nxp-zephyr/version b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/version new file mode 120000 index 00000000000000..a40ba48b0188a8 --- /dev/null +++ b/integrations/docker/images/stage-2/chip-build-nxp-zephyr/version @@ -0,0 +1 @@ +../../base/chip-build/version \ No newline at end of file diff --git a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile index e4c4ace95a1341..df6018847acb59 100644 --- a/integrations/docker/images/vscode/chip-build-vscode/Dockerfile +++ b/integrations/docker/images/vscode/chip-build-vscode/Dockerfile @@ -11,6 +11,7 @@ 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-zephyr:${VERSION} AS nxpzephyr FROM ghcr.io/project-chip/chip-build-imx:${VERSION} AS imx FROM ghcr.io/project-chip/chip-build-ti:${VERSION} AS ti FROM ghcr.io/project-chip/chip-build-openiotsdk:${VERSION} AS openiotsdk @@ -50,6 +51,9 @@ COPY --from=k32w /opt/sdk /opt/k32w COPY --from=rw61x /opt/sdk /opt/nxp-sdk +COPY --from=nxpzephyr /opt/nxp-zephyr/zephyr-sdk-0.16.5/ /opt/nxp-zephyr/zephyr-sdk-0.16.5/ +COPY --from=nxpzephyr /opt/nxp-zephyr/zephyrproject/ /opt/nxp-zephyr/zephyrproject/ + COPY --from=imx /opt/fsl-imx-xwayland /opt/fsl-imx-xwayland COPY --from=ti /opt/ti/sysconfig_1.18.1 /opt/ti/sysconfig_1.18.1 @@ -138,6 +142,8 @@ ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.18.1 ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5 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.5 ENV TIZEN_VERSION 7.0 ENV TIZEN_SDK_ROOT /opt/tizen-sdk