@@ -7,7 +7,7 @@ ARG VERSION=1
7
7
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
8
8
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
9
9
# Compatible Nordic Connect SDK revision.
10
- ARG NCS_REVISION=v2.7 .0
10
+ ARG NCS_REVISION=v2.9 .0
11
11
12
12
# Requirements to clone SDKs in temporary container
13
13
RUN set -x \
@@ -19,13 +19,14 @@ RUN set -x \
19
19
SHELL ["/bin/bash" , "-o" , "pipefail" , "-c" ]
20
20
WORKDIR /opt/NordicSemiconductor/nRF5_tools
21
21
RUN set -x \
22
- && curl --location https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-18-1 /nrf-command-line-tools-10.18.1_linux -amd64.tar.gz \
22
+ && curl --location https://nsscprodmedia.blob.core.windows.net/prod/software-and-other-downloads/desktop-software/nrf-command-line-tools/sw/versions-10-x-x/10-24-2 /nrf-command-line-tools-10.24.2_linux -amd64.tar.gz \
23
23
| tar zxvf - \
24
- && tar xvf JLink_Linux_V780c_x86_64.tgz \
25
- && rm JLink_Linux_V780c_x86_64.* \
26
- && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.5/zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
27
- && tar xvf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
28
- && zephyr-sdk-0.16.5/setup.sh -t arm-zephyr-eabi \
24
+ && tar xvf JLink_Linux_V794e_x86_64.tgz \
25
+ && rm JLink_Linux_V794e_x86_64.* \
26
+ && curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
27
+ && tar xvf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
28
+ && rm -rf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz \
29
+ && zephyr-sdk-0.17.0/setup.sh -t arm-zephyr-eabi \
29
30
&& : # last line
30
31
31
32
WORKDIR /opt/NordicSemiconductor/nrfconnect
@@ -55,21 +56,22 @@ COPY --from=build /opt/NordicSemiconductor/nRF5_tools/ /opt/NordicSemiconductor/
55
56
COPY --from=build /opt/NordicSemiconductor/nrfconnect/ /opt/NordicSemiconductor/nrfconnect/
56
57
57
58
RUN set -x \
58
- # python3-yaml package conflicts with nRF Python requirements
59
- && (apt-get remove -fy python3-yaml && apt-get autoremove || exit 0) \
59
+ # python3-yaml and python3-numpy packages conflict with nRF Python requirements
60
+ && (apt-get remove -fy python3-yaml python3-numpy && apt-get autoremove || exit 0) \
60
61
&& python3 -m pip install --break-system-packages -U --no-cache-dir cmake==3.25.0 \
61
62
&& python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/zephyr/scripts/requirements-base.txt \
62
63
&& python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/nrf/scripts/requirements-build.txt \
63
64
&& python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/bootloader/mcuboot/scripts/requirements.txt \
65
+ && python3 -m pip install --break-system-packages --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/modules/lib/matter/scripts/setup/requirements.nrfconnect.txt \
64
66
&& : # last line
65
67
66
68
ENV NRF5_TOOLS_ROOT=/opt/NordicSemiconductor/nRF5_tools
67
- ENV PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64 :${PATH}
69
+ ENV PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V794e_x86_64 :${PATH}
68
70
ENV PATH=${NRF5_TOOLS_ROOT}/nrf-command-line-tools/bin:${PATH}
69
- ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64 :${LD_LIBRARY_PATH}
71
+ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V794e_x86_64 :${LD_LIBRARY_PATH}
70
72
ENV LC_ALL=C.UTF-8
71
73
ENV LANG=C.UTF-8
72
74
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
73
- ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.5
75
+ ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.17.0
74
76
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
75
77
ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
0 commit comments