From ad9755b30f7a18d6fa27f1b60701d53356649043 Mon Sep 17 00:00:00 2001 From: Simon Chung Date: Fri, 13 Sep 2024 17:27:11 +0100 Subject: [PATCH] Add nodejs to docker-rdk-ci container (#6) * RDKE-61: Use common GH context variables (#4) (#5) * RDKE-61: Use common GH context variables * RDKE-61: Updates for pckage deploy * Add nodejs to docker-rdk-ci container nodejs is required by Synopsis Coverity Reporting tool * Fix verify-build workflow --------- Co-authored-by: Shibu Kakkoth Vayalambron --- .github/workflows/verify-build.yml | 3 +-- Dockerfile | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index 934b465..4b4880b 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -2,8 +2,7 @@ name: Build and Push amd64 Docker Image to GHCR on: pull_request: - branches: - - main, develop + branches: [ main, develop ] jobs: build-and-push: diff --git a/Dockerfile b/Dockerfile index 798bd13..b20dadd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive -LABEL org.opencontainers.image.source https://github.com/rdkcentral/docker-rdk-ci +LABEL org.opencontainers.image.source=https://github.com/rdkcentral/docker-rdk-ci LABEL org.opencontainers.image.authors="RDK Engineers" LABEL org.opencontainers.image.description="RDK CI Docker Image" LABEL org.opencontainers.image.architectures="amd64, arm64" @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y build-essential \ 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 \ - gdb valgrind lcov clang g++ wget gperf ruby-full + gdb valgrind lcov clang g++ wget gperf ruby-full curl # Common python packages RUN pip3 install xmltodict requests jsonref @@ -39,6 +39,10 @@ RUN cd /usr/src/googletest/googlemock/ && mkdir build && cmake .. && make && mak RUN mkdir -p /home/mount +# Install nodejs +RUN curl -sL https://deb.nodesource.com/setup_22.x | bash - +RUN apt-get install -q -y nodejs + # Trim down the docker image size RUN rm -rf /var/lib/apt/lists/*