From f927eb1f8f33b75aef752dbe76a86215b46da244 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Thu, 27 Jul 2023 21:03:50 +0530 Subject: [PATCH 1/4] [ESP32] Update docker image to use esp-idf v5.1 --- integrations/docker/images/stage-2/chip-build-esp32/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile index 71ce49fe5e84ba..65f4eaf4a5a572 100644 --- a/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-esp32/Dockerfile @@ -11,7 +11,7 @@ RUN set -x \ && : # last line RUN set -x \ - && git clone --recursive -b v4.4.4 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \ + && git clone --recursive -b v5.1 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \ && : # last line FROM ghcr.io/project-chip/chip-build:${VERSION} From 39f340fee113a8dc62d8e444f943242bc5b84145 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Thu, 27 Jul 2023 21:04:53 +0530 Subject: [PATCH 2/4] Dockerfile: Remove few pinned versions from packages Removing the pinned versions for packages for below platforms - efr32: ccache - nrf: device-tree-compiler - openiotsdk: wget - telink: ccache, device-tree-compiler --- .../docker/images/stage-2/chip-build-efr32/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-nrf-platform/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-openiotsdk/Dockerfile | 2 +- .../docker/images/stage-2/chip-build-telink/Dockerfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index 511bfba3022db6..8ef885f710b36a 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -11,7 +11,7 @@ RUN set -x \ git-lfs \ openjdk-17-jdk \ python3-sphinx \ - ccache=3.7.7-1 \ + ccache \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile index 2d0e0aa9a80fb7..b01028f4708310 100644 --- a/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-nrf-platform/Dockerfile @@ -39,7 +39,7 @@ FROM ghcr.io/project-chip/chip-build:${VERSION} # Tools for building, flashing and accessing device logs RUN set -x \ && apt-get update \ - && apt-get install --no-install-recommends -fy device-tree-compiler=1.5.1-1 \ + && apt-get install --no-install-recommends -fy device-tree-compiler \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile index b61d8860b3b18a..b1a56350a01d00 100644 --- a/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-openiotsdk/Dockerfile @@ -5,7 +5,7 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - wget=1.20.3-1ubuntu2 \ + wget \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && : # last line diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 88ac1d10828ccc..19b743b056554e 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -52,9 +52,9 @@ ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.16.1 RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - ccache=3.7.7-1 \ + ccache \ dfu-util=0.9-1 \ - device-tree-compiler=1.5.1-1 \ + device-tree-compiler \ gcc-multilib=4:9.3.0-1ubuntu2 \ g++-multilib=4:9.3.0-1ubuntu2 \ libsdl2-dev=2.0.10+dfsg1-3 \ From 4383d21d18a2767134a6154b5b1e88427505346b Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Thu, 27 Jul 2023 21:21:45 +0530 Subject: [PATCH 3/4] Dockerfile: Remove pinned versions for few packages - efr32: gcc-arm-none-eabi, binutils-arm-none-eabi - telink: gcc-multilib, g++-multilib, libsdl2-dev --- .../docker/images/stage-2/chip-build-efr32/Dockerfile | 4 ++-- .../docker/images/stage-2/chip-build-telink/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile index 8ef885f710b36a..1946a0e6073717 100644 --- a/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-efr32/Dockerfile @@ -6,8 +6,8 @@ LABEL org.opencontainers.image.source https://github.com/project-chip/connectedh RUN set -x \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \ - gcc-arm-none-eabi=15:9-2019-q4-0ubuntu1 \ - binutils-arm-none-eabi=2.34-4ubuntu1+13ubuntu1 \ + gcc-arm-none-eabi \ + binutils-arm-none-eabi \ git-lfs \ openjdk-17-jdk \ python3-sphinx \ diff --git a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile index 19b743b056554e..8f564c73d97206 100644 --- a/integrations/docker/images/stage-2/chip-build-telink/Dockerfile +++ b/integrations/docker/images/stage-2/chip-build-telink/Dockerfile @@ -55,9 +55,9 @@ RUN set -x \ ccache \ dfu-util=0.9-1 \ device-tree-compiler \ - gcc-multilib=4:9.3.0-1ubuntu2 \ - g++-multilib=4:9.3.0-1ubuntu2 \ - libsdl2-dev=2.0.10+dfsg1-3 \ + gcc-multilib \ + g++-multilib \ + libsdl2-dev \ && apt-get clean \ && rm -rf /var/lib/apt/lists/ \ && python3 -m pip install -U --no-cache-dir \ From 2981be7ebcde1c7d04c840ce8d7342b675c5dab9 Mon Sep 17 00:00:00 2001 From: Shubham Patil Date: Thu, 27 Jul 2023 21:31:11 +0530 Subject: [PATCH 4/4] Docker: Update the version --- integrations/docker/images/base/chip-build/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integrations/docker/images/base/chip-build/version b/integrations/docker/images/base/chip-build/version index 2758ff7463d15a..6b5e738e874668 100644 --- a/integrations/docker/images/base/chip-build/version +++ b/integrations/docker/images/base/chip-build/version @@ -1 +1 @@ -1 : Moving to GHCR +2 : Update esp-idf to v5.1 and remove few pinned package version