From 3708b9a10204cc43b918727db2d565118a80a32d Mon Sep 17 00:00:00 2001 From: Araviiiiiii <146185556+Araviiiiiii@users.noreply.github.com> Date: Fri, 17 Oct 2025 11:28:16 +0530 Subject: [PATCH 1/4] Update Dockerfile with L2HALMOCK utilities --- Dockerfile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9c7b8bc..60adf45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,33 @@ RUN apt-get update && apt-get install -y build-essential \ libgtest-dev libgmock-dev libjansson-dev libbsd-dev tcl-dev \ libboost-all-dev libwebsocketpp-dev libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev libavro-dev \ gdb valgrind lcov clang g++ wget gperf ruby-full curl + # Base image +FROM ubuntu:20.04 + +# Set non-interactive mode for apt +ENV DEBIAN_FRONTEND=noninteractive + +# Update and install system dependencies +RUN apt-get update && apt-get install -y \ + build-essential cmake ninja-build meson \ + wget curl openssl tar vim git git-lfs \ + libtool autotools-dev automake zlib1g-dev \ + libglib2.0-dev libcurl4-openssl-dev libmsgpack-dev \ + libsystemd-dev libssl-dev libcjson-dev libsqlite3-dev \ + libgtest-dev libgmock-dev libjansson-dev libjansson4 \ + libbsd-dev tcl-dev libboost-all-dev libwebsocketpp-dev \ + libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev \ + libavro-dev libusb-1.0-0-dev libjsoncpp-dev libwebsockets-dev \ + libdirectfb-dev net-tools netcat psmisc gdb valgrind lcov clang \ + g++ g++-9 gcc-9 ruby-full csvtool lynx autoconf \ + && add-apt-repository ppa:ubuntu-toolchain-r/ppa -y \ + && apt-get update + +# Python and pip dependencies +RUN apt-get install -y python3-pip python3-distutils \ + && pip install --no-cache-dir \ + flake8 peru jsonref websockets pandas beautifulsoup4 flask colorama + # Common python packages RUN pip3 install xmltodict requests jsonref From d16ba8d9292003c6ec5446ef4f334fc4b38974dc Mon Sep 17 00:00:00 2001 From: Araviiiiiii <146185556+Araviiiiiii@users.noreply.github.com> Date: Fri, 17 Oct 2025 11:36:12 +0530 Subject: [PATCH 2/4] Update Dockerfile with latest l2halmock utility updates --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 60adf45..1933c12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,11 +17,6 @@ RUN apt-get update && apt-get install -y build-essential \ libgtest-dev libgmock-dev libjansson-dev libbsd-dev tcl-dev \ libboost-all-dev libwebsocketpp-dev libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev libavro-dev \ gdb valgrind lcov clang g++ wget gperf ruby-full curl - # Base image -FROM ubuntu:20.04 - -# Set non-interactive mode for apt -ENV DEBIAN_FRONTEND=noninteractive # Update and install system dependencies RUN apt-get update && apt-get install -y \ @@ -39,7 +34,8 @@ RUN apt-get update && apt-get install -y \ && add-apt-repository ppa:ubuntu-toolchain-r/ppa -y \ && apt-get update -# Python and pip dependencies + + #Python and pip dependencies RUN apt-get install -y python3-pip python3-distutils \ && pip install --no-cache-dir \ flake8 peru jsonref websockets pandas beautifulsoup4 flask colorama From 7a03ec5e3d4e5ee1544405e5e7669f439e93ab4a Mon Sep 17 00:00:00 2001 From: Araviiiiiii <146185556+Araviiiiiii@users.noreply.github.com> Date: Tue, 21 Oct 2025 12:47:59 +0530 Subject: [PATCH 3/4] Update Dockerfile to solve gcc error --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1933c12..c9c5cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,8 @@ RUN apt-get update && apt-get install -y build-essential \ libboost-all-dev libwebsocketpp-dev libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev libavro-dev \ gdb valgrind lcov clang g++ wget gperf ruby-full curl -# Update and install system dependencies + +# Update and install additional system dependencies RUN apt-get update && apt-get install -y \ build-essential cmake ninja-build meson \ wget curl openssl tar vim git git-lfs \ @@ -35,7 +36,8 @@ RUN apt-get update && apt-get install -y \ && apt-get update - #Python and pip dependencies + +# Python and pip dependencies RUN apt-get install -y python3-pip python3-distutils \ && pip install --no-cache-dir \ flake8 peru jsonref websockets pandas beautifulsoup4 flask colorama From fe854d69575e2943c0aae6b63979737d90af23cc Mon Sep 17 00:00:00 2001 From: Araviiiiiii <146185556+Araviiiiiii@users.noreply.github.com> Date: Tue, 21 Oct 2025 12:53:52 +0530 Subject: [PATCH 4/4] Update Dockerfile for pip error --- Dockerfile | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9c5cd8..fe7a8f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,19 +8,15 @@ LABEL org.opencontainers.image.authors="RDK Engineers" LABEL org.opencontainers.image.description="RDK CI Docker Image" LABEL org.opencontainers.image.architectures="amd64, arm64" -# Add instructions to install autotools -RUN apt-get update && apt-get install -y build-essential \ - wget openssl tar vim git git-lfs \ - libtool autotools-dev automake zlib1g-dev ninja-build meson \ - libglib2.0-dev python3-distutils libcurl4-openssl-dev \ - libmsgpack-dev libsystemd-dev libssl-dev libcjson-dev python3-pip libsqlite3-dev \ - libgtest-dev libgmock-dev libjansson-dev libbsd-dev tcl-dev \ - libboost-all-dev libwebsocketpp-dev libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev libavro-dev \ - gdb valgrind lcov clang g++ wget gperf ruby-full curl - - -# Update and install additional system dependencies -RUN apt-get update && apt-get install -y \ + +# Add PPA for gcc-9 and g++-9 +RUN apt-get update && apt-get install -y software-properties-common \ + && add-apt-repository ppa:ubuntu-toolchain-r/ppa -y \ + && apt-get update + + +# Install all required system packages +RUN apt-get install -y \ build-essential cmake ninja-build meson \ wget curl openssl tar vim git git-lfs \ libtool autotools-dev automake zlib1g-dev \ @@ -31,18 +27,18 @@ RUN apt-get update && apt-get install -y \ libcunit1 libcunit1-dev libunwind-dev libcap-dev libdbus-1-dev \ libavro-dev libusb-1.0-0-dev libjsoncpp-dev libwebsockets-dev \ libdirectfb-dev net-tools netcat psmisc gdb valgrind lcov clang \ - g++ g++-9 gcc-9 ruby-full csvtool lynx autoconf \ - && add-apt-repository ppa:ubuntu-toolchain-r/ppa -y \ - && apt-get update + g++ g++-9 gcc-9 ruby-full csvtool lynx autoconf gperf \ + python3-pip python3-distutils \ + && apt-get clean && rm -rf /var/lib/apt/lists/* -# Python and pip dependencies -RUN apt-get install -y python3-pip python3-distutils \ - && pip install --no-cache-dir \ +# Install Python packages +RUN pip install --no-cache-dir \ flake8 peru jsonref websockets pandas beautifulsoup4 flask colorama + # Common python packages RUN pip3 install xmltodict requests jsonref