From 5ffca11cc07f56426a0959c49aabee4e39dafdcc Mon Sep 17 00:00:00 2001 From: Damian Krolik Date: Wed, 29 Jul 2020 15:57:33 +0200 Subject: [PATCH] Update nRF docker image to use more recent openthread After #1879 had been merged CHIP would no longer build with openthread version included in nRF Connect SDK 1.3.0 due to lack of otJoinerDiscerner() function. Therefore, update the docker image to use NCS master branch where recent openthread changes have already been merged. --- integrations/docker/images/chip-build-nrf-platform/Dockerfile | 4 ++-- integrations/docker/images/chip-build/version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integrations/docker/images/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/chip-build-nrf-platform/Dockerfile index 2289faf4ddabfb..95c6828144a7d9 100644 --- a/integrations/docker/images/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/chip-build-nrf-platform/Dockerfile @@ -47,10 +47,10 @@ RUN set -x \ # Device Tree Compiler 1.4.7 && curl -o /tmp/dtc.deb http://mirrors.edge.kernel.org/ubuntu/pool/main/d/device-tree-compiler/device-tree-compiler_1.4.7-3ubuntu2_amd64.deb \ && dpkg -i /tmp/dtc.deb \ - # nRF Connect SDK 1.3.0 sources & requirements + # nRF Connect SDK [master] sources & requirements && (mkdir /var/ncs && cd /var/ncs \ && pip3 install --no-cache-dir setuptools wheel cmake west \ - && west init -m https://github.com/nrfconnect/sdk-nrf --mr v1.3.0 \ + && west init -m https://github.com/nrfconnect/sdk-nrf \ && west update \ && pip3 install --no-cache-dir -r zephyr/scripts/requirements.txt \ && pip3 install --no-cache-dir -r nrf/scripts/requirements.txt \ diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version index 1d0ba9ea182b0f..267577d47e497a 100644 --- a/integrations/docker/images/chip-build/version +++ b/integrations/docker/images/chip-build/version @@ -1 +1 @@ -0.4.0 +0.4.1