Skip to content

Commit

Permalink
[nrfconnect] Updated nRF Connect SDK version in Docker to 2.5.0 (proj…
Browse files Browse the repository at this point in the history
…ect-chip#30051)

Regular update of nRF Connect SDK to 2.5.0 version including
zephyr toolchain and west versions bump.
  • Loading branch information
kkasperczyk-no authored and mideayanghui committed Oct 31, 2023
1 parent 6fdec07 commit aa8f7cb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
23 : [TI] Update Sysconfig version
24 : [nrfconnect] Update nRF Connect SDK version.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG VERSION=1
FROM ghcr.io/project-chip/chip-build:${VERSION} as build
LABEL org.opencontainers.image.source https://github.com/project-chip/connectedhomeip
# Compatible Nordic Connect SDK revision.
ARG NCS_REVISION=v2.4.0
ARG NCS_REVISION=v2.5.0

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
WORKDIR /opt/NordicSemiconductor/nRF5_tools
Expand All @@ -16,14 +16,14 @@ RUN set -x \
| tar zxvf - \
&& tar xvf JLink_Linux_V780c_x86_64.tgz \
&& rm JLink_Linux_V780c_x86_64.* \
&& 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 \
&& tar xvf zephyr-sdk-0.16.0_linux-x86_64_minimal.tar.xz \
&& zephyr-sdk-0.16.0/setup.sh -t arm-zephyr-eabi \
&& 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 \
&& tar xvf zephyr-sdk-0.16.1_linux-x86_64_minimal.tar.xz \
&& zephyr-sdk-0.16.1/setup.sh -t arm-zephyr-eabi \
&& : # last line

WORKDIR /opt/NordicSemiconductor/nrfconnect
RUN set -x \
&& python3 -m pip install -U --no-cache-dir west==1.0.0 \
&& python3 -m pip install -U --no-cache-dir west==1.1.0 \
&& west init -m https://github.com/nrfconnect/sdk-nrf --mr "$NCS_REVISION" \
&& west config update.narrow true \
&& west config update.fetch smart \
Expand Down Expand Up @@ -63,6 +63,6 @@ ENV LD_LIBRARY_PATH=${NRF5_TOOLS_ROOT}/JLink_Linux_V780c_x86_64:${LD_LIBRARY_PAT
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.0
ENV ZEPHYR_SDK_INSTALL_DIR=${NRF5_TOOLS_ROOT}/zephyr-sdk-0.16.1
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
ENV ZEPHYR_TOOLCHAIN_PATH=${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ ENV TELINK_ZEPHYR_BASE=/opt/telink/zephyrproject/zephyr
ENV TELINK_ZEPHYR_SDK_DIR=/opt/telink/zephyr-sdk-0.16.1
ENV TI_SYSCONFIG_ROOT=/opt/ti/sysconfig_1.16.2
ENV ZEPHYR_BASE=/opt/NordicSemiconductor/nrfconnect/zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.0
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/NordicSemiconductor/nRF5_tools/zephyr-sdk-0.16.1
ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb

ENV TIZEN_VERSION 7.0
Expand Down

0 comments on commit aa8f7cb

Please sign in to comment.