Skip to content

Commit

Permalink
Pull request project-chip#1572: NoJira: Unify Docker build fix
Browse files Browse the repository at this point in the history
Merge in WMN_TOOLS/matter from bugfix/docker_build_fix to silabs

Squashed commit of the following:

commit 312994abc83b6aa8573e688460995224fdda6bb1
Author: thirupathi <ths@silabs.com>
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 <ths@silabs.com>
Date:   Fri Feb 16 10:39:11 2024 +0530

    Docker build fix
  • Loading branch information
Thirsrin authored and jmartinez-silabs committed Mar 27, 2024
1 parent ccf7264 commit 2e9f334
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions silabs_examples/unify-matter-common/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 2e9f334

Please sign in to comment.