Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[docker] Update nRF Connect SDK version #15308

Merged
merged 2 commits into from
Feb 18, 2022
Merged

[docker] Update nRF Connect SDK version #15308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b9ce1e
[docker] Update nRF Connect SDK version
Damian-Nordic Feb 17, 2022
e1a3a5c
Fix ZAP Dockerfile by the way
Damian-Nordic Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integrations/docker/images/chip-build-nrf-platform/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG VERSION=latest
FROM connectedhomeip/chip-build:${VERSION} as build

# Compatible Nordic Connect SDK revision.
ARG NCS_REVISION=v1.8.0
ARG NCS_REVISION=v1.9.0

RUN set -x \
&& apt-get update \
Expand All @@ -28,7 +28,6 @@ RUN set -x \
WORKDIR /opt/NordicSemiconductor/nrfconnect
RUN set -x \
&& python3 -m pip install -U --no-cache-dir \
cmake==3.21.2 \
west==0.12.0 \
&& west init -m https://github.com/nrfconnect/sdk-nrf \
&& git -C nrf fetch origin "$NCS_REVISION" \
Expand Down Expand Up @@ -60,6 +59,7 @@ COPY --from=build /opt/NordicSemiconductor/nrfconnect/ /opt/NordicSemiconductor/
RUN set -x \
# python3-yaml package conflicts with nRF Python requirements
&& (apt-get remove -fy python3-yaml && apt-get autoremove || exit 0) \
&& python3 -m pip install -U --no-cache-dir cmake==3.22.2 \
&& python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/zephyr/scripts/requirements.txt \
&& python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/nrf/scripts/requirements.txt \
&& python3 -m pip install --no-cache-dir -r /opt/NordicSemiconductor/nrfconnect/bootloader/mcuboot/scripts/requirements.txt \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-zap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM alpine:3.14

RUN apk add --no-cache \
nodejs=14.18.1-r0 \
nodejs=14.19.0-r0 \
openjdk11=11.0.14_p9-r0 \
npm=7.17.0-r0 \
python3=3.9.5-r2 \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.55 Version bump reason: [Ameba] Support OTA header
0.5.56 Version bump reason: Update nRF Connect SDK