Skip to content

Commit 42582e7

Browse files
[nrfconnect] Bump SDK version in Docker
Bump nrfconnect SDK version to v2.6.0. Full changelog is available on the https://developer.nordicsemi.com/nRF_Connect_SDK/doc/2.6.0/nrf/releases_and_maturity/releases/release-notes-2.6.0.html page.
1 parent c90481f commit 42582e7

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-
40 : [NuttX] Add support for NuttX SDK
1+
41 : [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.5.0
10+
ARG NCS_REVISION=v2.6.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.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 \
19+
&& 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 \
20+
&& tar xvf zephyr-sdk-0.16.5_linux-x86_64_minimal.tar.xz \
21+
&& zephyr-sdk-0.16.5/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.1.0 \
26+
&& python3 -m pip install -U --no-cache-dir west==1.2.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.1
66+
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.5
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
@@ -129,7 +129,7 @@ ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
129129
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
130130
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
131131
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
132-
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1
132+
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.5
133133
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
134134

135135
ENV TIZEN_VERSION 7.0

0 commit comments

Comments
 (0)