From 7ff30e0f9f785452990c50cf2867bc3696b84ea4 Mon Sep 17 00:00:00 2001
From: Markus Tacker <Markus.Tacker@NordicSemi.no>
Date: Fri, 27 Oct 2023 14:51:09 +0200
Subject: [PATCH] feat: build for SDK release 2.5.0

---
 .github/workflows/publish-docker.yaml | 5 ++++-
 .github/workflows/verify.yaml         | 5 ++++-
 Dockerfile                            | 6 +++---
 README.md                             | 6 +++---
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
index a5efcf2..12b94bd 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -13,6 +13,7 @@ jobs:
       matrix:
         sdk_nrf_branch:
           - main
+          - v2.5-branch
           - v2.4-branch
           - v2.3-branch
           - v2.2-branch
@@ -20,7 +21,9 @@ jobs:
           - v2.0-branch
         include:
           - sdk_nrf_branch: main
-            toolchain_version: v2.4.1
+            toolchain_version: main
+          - sdk_nrf_branch: v2.5-branch
+            toolchain_version: v2.5.0
           - sdk_nrf_branch: v2.4-branch
             toolchain_version: v2.4.1
           - sdk_nrf_branch: v2.3-branch
diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index eab0d0e..8cd2651 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -8,6 +8,7 @@ jobs:
       matrix:
         sdk_nrf_branch:
           - main
+          - v2.5-branch
           - v2.4-branch
           - v2.3-branch
           - v2.2-branch
@@ -15,7 +16,9 @@ jobs:
           - v2.0-branch
         include:
           - sdk_nrf_branch: main
-            toolchain_version: v2.4.1
+            toolchain_version: main
+          - sdk_nrf_branch: v2.5-branch
+            toolchain_version: v2.5.0
           - sdk_nrf_branch: v2.4-branch
             toolchain_version: v2.4.1
           - sdk_nrf_branch: v2.3-branch
diff --git a/Dockerfile b/Dockerfile
index 6c675bb..c39f58e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM ubuntu:22.04 as base
 WORKDIR /workdir
 
-ARG sdk_nrf_branch=v2.4-branch
-ARG toolchain_version=v2.4.1
+ARG sdk_nrf_branch=v2.5-branch
+ARG toolchain_version=v2.5.0
 ARG sdk_nrf_commit
-ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-23-0/nrf-command-line-tools-10.23.0"
+ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="10-23-2/nrf-command-line-tools-10.23.2"
 ARG arch=amd64
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/README.md b/README.md
index 32aa499..8681e2f 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Dockerfile example for building nRF Connect SDK applications
 
 ![Publish Docker](https://github.com/NordicPlayground/nrf-docker/workflows/Publish%20Docker/badge.svg?branch=saga)
-(_the [Docker image](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk) is build against [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf) `main`,`v2.4-branch`,`v2.3-branch`,`v2.2-branch`,`v2.1-branch`, and `v2.0-branch` every night._)
+(_the [Docker image](https://hub.docker.com/r/nordicplayground/nrfconnect-sdk) is build against [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf) `main`,`v2.5-branch`,`v2.4-branch`,`v2.3-branch`,`v2.2-branch`,`v2.1-branch`, and `v2.0-branch` every night._)
 
 ![Docker + Zephyr -> merged.hex](./diagram.png)
 
@@ -35,7 +35,7 @@ Build the image (this is only needed once):
 
 ```bash
 cd nrf-docker
-docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.4-branch .
+docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.5-branch .
 ```
 
 > [!NOTE]
@@ -99,7 +99,7 @@ docker run --rm -v ${PWD}:/workdir/project \
 # build docker image
 git clone https://github.com/NordicPlayground/nrf-docker
 cd nrf-docker
-docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.4-branch .
+docker build -t nrfconnect-sdk --build-arg sdk_nrf_version=v2.5-branch .
 cd ..
 ```