From 2e9f3345e4ec957db60eb5f4e5816db399e9477d Mon Sep 17 00:00:00 2001 From: Thirupathi S Date: Tue, 20 Feb 2024 17:14:11 +0000 Subject: [PATCH] Pull request #1572: NoJira: Unify Docker build fix Merge in WMN_TOOLS/matter from bugfix/docker_build_fix to silabs Squashed commit of the following: commit 312994abc83b6aa8573e688460995224fdda6bb1 Author: thirupathi Date: Fri Feb 16 11:54:56 2024 +0530 update the docker image in artifactory and update jenkinsfile to use the latest docker image commit 78a84fa005e40e6709dc1798011dbe44c46bc869 Author: thirupathi Date: Fri Feb 16 10:39:11 2024 +0530 Docker build fix --- Jenkinsfile | 2 +- silabs_examples/unify-matter-common/docker/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 331c824f898bc2..2a8271b3935659 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -222,7 +222,7 @@ def buildUnify(arch, triples, app, compile_tests) withDockerRegistry([url: "https://artifactory.silabs.net ", credentialsId: 'svc_gsdk']) { - def unify_matter_docker = docker.image('artifactory.silabs.net/gsdk-docker-production/unify-cache/unify-matter:1.1.4-' + arch) + def unify_matter_docker = docker.image('artifactory.silabs.net/gsdk-docker-production/unify-cache/unify-matter:1.1.5-' + arch) stage('unify ' + arch) { dir(dirPath) { unify_matter_docker.inside("-u root -v${unifyCheckoutDir}:/unify") diff --git a/silabs_examples/unify-matter-common/docker/Dockerfile b/silabs_examples/unify-matter-common/docker/Dockerfile index 223ae19f670b8d..738b1e7ee55f1c 100644 --- a/silabs_examples/unify-matter-common/docker/Dockerfile +++ b/silabs_examples/unify-matter-common/docker/Dockerfile @@ -9,12 +9,12 @@ WORKDIR / ARG ARCH="arm64" ARG TARGET_DEPS="libavahi-client-dev:${ARCH}=0.8-5* libssl-dev:${ARCH}=1.1.1w-0* libsystemd-dev:${ARCH}=247.3-7* libwrap0-dev:${ARCH}=7.6.q-31 uthash-dev:${ARCH}=2.1.0-1 \ - libsqlite3-dev:${ARCH}=3.34.1-3 libedit-dev:${ARCH}=3.1-20191231-2+b1 libyaml-cpp0.6:${ARCH}=0.6.3-9 libmosquitto-dev:${ARCH}=2.0.11-1\ + libsqlite3-dev:${ARCH}=3.34.1-3 libedit-dev:${ARCH}=3.1-20191231-2+b1 libyaml-cpp0.6:${ARCH}=0.6.3-9 libmosquitto-dev:${ARCH}=2.0.11-1+deb11u1\ libreadline-dev:${ARCH}=8.1-1 libncurses5-dev:${ARCH}=6.2+20201114-2+deb11u2 libncursesw5-dev:${ARCH}=6.2+20201114-2+deb11u2 libyaml-cpp-dev:${ARCH}=0.6.3-9 \ libboost-atomic-dev:${ARCH}=1.74.0.3 libboost-chrono-dev:${ARCH}=1.74.0.3 libboost-date-time-dev:${ARCH}=1.74.0.3 \ libboost-filesystem-dev:${ARCH}=1.74.0.3 libboost-regex-dev:${ARCH}=1.74.0.3 libboost-program-options-dev:${ARCH}=1.74.0.3 \ libboost-serialization-dev:${ARCH}=1.74.0.3 libboost-system-dev:${ARCH}=1.74.0.3 libboost-thread-dev:${ARCH}=1.74.0.3 \ - libboost-log-dev:${ARCH}=1.74.0.3 procps:${ARCH}=2:3.3.17-5 libmbedtls-dev:${ARCH}=2.16.9-0.1 libglib2.0-dev:${ARCH}=2.66.8-1" + libboost-log-dev:${ARCH}=1.74.0.3 procps:${ARCH}=2:3.3.17-5 libmbedtls-dev:${ARCH}=2.16.9-0.1 libglib2.0-dev:${ARCH}=2.66.8-1+deb11u1" ARG HOST_DEPS="ninja-build=1.10.1-1 git=1:2.30.2-1* git-lfs=2.13.2-1+b5 \ curl=7.74.0-1.3* pkg-config=0.29.2-1 \