Skip to content

Commit

Permalink
Implement Docker best practices on Telink image (#11287)
Browse files Browse the repository at this point in the history
Some of these best practices are:
* Multi-stage builds
* Pin versions
* Avoid additional packages installation
* Clean all missing after apt command

Signed-off-by: Victor Morales <v.morales@samsung.com>
  • Loading branch information
electrocucaracha authored and pull[bot] committed Feb 1, 2022
1 parent ab16247 commit 5160169
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 25 deletions.
73 changes: 49 additions & 24 deletions integrations/docker/images/chip-build-telink/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,60 @@
ARG VERSION=latest
FROM connectedhomeip/chip-build:${VERSION}
FROM connectedhomeip/chip-build:${VERSION} as build

RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
wget=1.20.3-1ubuntu1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& : # last line

# Setup toolchain
ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.13.0
RUN wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.13.0/zephyr-toolchain-riscv64-0.13.0-linux-x86_64-setup.run\
&& chmod +x zephyr-toolchain-riscv64-0.13.0-linux-x86_64-setup.run \
&& ./zephyr-toolchain-riscv64-0.13.0-linux-x86_64-setup.run -- -d ${ZEPHYR_SDK_INSTALL_DIR} \
&& rm zephyr-toolchain-riscv64-0.13.0-linux-x86_64-setup.run
RUN set -x \
&& wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.13.0/zephyr-toolchain-riscv64-0.13.0-linux-x86_64-setup.run -O /tmp/zephyr-toolchain-riscv64-setup.run \
&& chmod +x /tmp/zephyr-toolchain-riscv64-setup.run \
&& /tmp/zephyr-toolchain-riscv64-setup.run -- -d /opt/telink/zephyr-sdk-0.13.0 \
&& : # last line

# Setup Zephyr
ARG ZEPHYR_REVISION=19c519eb05d6d24a23fd084a3ab6c1a78edf5536
ARG ZEPHYR_PROJECT_DIR=/opt/telink/zephyrproject
ENV PATH="/root/.local/bin:${PATH}"
RUN apt update \
&& DEBIAN_FRONTEND=noninteractive apt install -y \
ccache \
dfu-util \
device-tree-compiler \
gcc-multilib \
g++-multilib \
libsdl2-dev \
&& pip3 install --user -U west \
&& pip3 install pyelftools \
&& git clone https://github.com/zephyrproject-rtos/zephyr ${ZEPHYR_PROJECT_DIR}/zephyr \
&& cd ${ZEPHYR_PROJECT_DIR}/zephyr \
WORKDIR /opt/telink/zephyrproject
RUN set -x \
&& python3 -m pip install -U --no-cache-dir \
west==0.11.1 \
&& git clone https://github.com/zephyrproject-rtos/zephyr \
&& cd zephyr \
&& git reset ${ZEPHYR_REVISION} --hard \
&& west init -l \
&& cd ${ZEPHYR_PROJECT_DIR} && west update && west zephyr-export \
&& python3 -m pip install -U pip \
&& pip3 install --user -r ${ZEPHYR_PROJECT_DIR}/zephyr/scripts/requirements.txt
&& cd .. \
&& west update \
&& west zephyr-export \
&& : # last line

FROM connectedhomeip/chip-build:${VERSION}

COPY --from=build /opt/telink/zephyr-sdk-0.13.0/ /opt/telink/zephyr-sdk-0.13.0/
COPY --from=build /opt/telink/zephyrproject/ /opt/telink/zephyrproject/

ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
ENV ZEPHYR_SDK_INSTALL_DIR=/opt/telink/zephyr-sdk-0.13.0

RUN set -x \
&& apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
ccache=3.7.7-1 \
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 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/ \
&& python3 -m pip install -U --no-cache-dir \
pyelftools==0.27 \
&& pip3 install --no-cache-dir --user -r /opt/telink/zephyrproject/zephyr/scripts/requirements.txt \
&& : # last line

ARG ZEPHYR_PROJECT_DIR=/opt/telink/zephyrproject
ENV TELINK_ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
ENV ZEPHYR_BASE=${ZEPHYR_PROJECT_DIR}/zephyr
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.5.24 Version bump reason: [Cirque] Bump version for virtual android chip-tool test
0.5.25 Version bump reason: [Telink] Implement Docker best practices

0 comments on commit 5160169

Please sign in to comment.