Skip to content

Commit 4379427

Browse files
kkasperczyk-nopull[bot]
authored andcommitted
[nrfconnect] Updated nRF Connect SDK version in Docker to 2.5.0 (#30051)
Regular update of nRF Connect SDK to 2.5.0 version including zephyr toolchain and west versions bump.
1 parent 67ee459 commit 4379427

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
23 : [TI] Update Sysconfig version
1+
24 : [nrfconnect] Update nRF Connect SDK version.

integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG VERSION=1
77
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
88
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
99
# Compatible Nordic Connect SDK revision.
10-
ARG NCS_REVISION=v2.4.0
10+
ARG NCS_REVISION=v2.5.0
1111

1212
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1313
WORKDIR /opt/NordicSemiconductor/nRF5_tools
@@ -16,14 +16,14 @@ RUN set -x \
1616
| tar zxvf - \
1717
&& tar xvf JLink_Linux_V780c_x86_64.tgz \
1818
&& rm JLink_Linux_V780c_x86_64.* \
19-
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.0/zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
20-
&& tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
21-
&& zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
19+
&& curl --location https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.1/zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz --output zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
20+
&& tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
21+
&& zephyr-sdk-0.16.1/setup.sh -t arm-zephyr-eabi \
2222
&& : # last line
2323

2424
WORKDIR /opt/NordicSemiconductor/nrfconnect
2525
RUN set -x \
26-
&& python3 -m pip install -U --no-cache-dir west==1.0.0 \
26+
&& python3 -m pip install -U --no-cache-dir west==1.1.0 \
2727
&& west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
2828
&& west config update.narrow true \
2929
&& west config update.fetch smart \
@@ -63,6 +63,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
6363
ENV LC_ALL=C.UTF-8
6464
ENV LANG=C.UTF-8
6565
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
66-
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
66+
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.1
6767
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
6868
ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
122122
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
123123
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
124124
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
125-
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0
125+
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1
126126
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
127127

128128
ENV TIZEN_VERSION 7.0

0 commit comments

Comments
 (0)