Skip to content

Commit

Permalink
Dockerfile: Update esp-idf to v5.1 and remove few pinned package vers…
Browse files Browse the repository at this point in the history
…ion (#28333)

* [ESP32] Update docker image to use esp-idf v5.1

* 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

* Dockerfile: Remove pinned versions for few packages

- efr32: gcc-arm-none-eabi, binutils-arm-none-eabi
- telink: gcc-multilib, g++-multilib, libsdl2-dev

* Docker: Update the version
  • Loading branch information
shubhamdp authored and pull[bot] committed Apr 24, 2024
1 parent 39c5920 commit 9692124
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1 : Moving to GHCR
2 : Update esp-idf to v5.1 and remove few pinned package version
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ 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 \
ccache=3.7.7-1 \
ccache \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions integrations/docker/images/stage-2/chip-build-telink/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ 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 \
gcc-multilib=4:9.3.0-1ubuntu2 \
g++-multilib=4:9.3.0-1ubuntu2 \
libsdl2-dev=2.0.10+dfsg1-3 \
device-tree-compiler \
gcc-multilib \
g++-multilib \
libsdl2-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& python3 -m pip install -U --no-cache-dir \
Expand Down

0 comments on commit 9692124

Please sign in to comment.