From dad9c15007f1c47673f67bfa709555d5c9ed8d82 Mon Sep 17 00:00:00 2001 From: Shibu Kakkoth Vayalambron Date: Fri, 21 Jun 2024 07:21:59 -0700 Subject: [PATCH 1/3] RDKE-61: Use common GH context variables (#4) (#5) * RDKE-61: Use common GH context variables * RDKE-61: Updates for pckage deploy --- .github/workflows/docker-publish.yml | 2 +- .github/workflows/verify-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 08fd2a3..238666a 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -24,7 +24,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.PACAKGE_UPDATE_KEY }} - name: Build and push multi-platform Docker image uses: docker/build-push-action@v4 diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index e8a4902..934b465 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -20,7 +20,7 @@ jobs: with: registry: ghcr.io username: ${{ github.actor }} - password: ${{ secrets.GHCR_TOKEN }} + password: ${{ secrets.PACAKGE_UPDATE_KEY }} - name: Build and push multi-platform Docker image uses: docker/build-push-action@v4 From 8af63a8d73bc03a3d8bc15c9a97b142bd5062ddf Mon Sep 17 00:00:00 2001 From: Simon Chung Date: Fri, 13 Sep 2024 11:30:18 +0100 Subject: [PATCH 2/3] Add nodejs to docker-rdk-ci container nodejs is required by Synopsis Coverity Reporting tool --- Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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/* From c764b2885d039115d588867c7e656837bc387d88 Mon Sep 17 00:00:00 2001 From: Simon Chung Date: Fri, 13 Sep 2024 11:41:37 +0100 Subject: [PATCH 3/3] Fix verify-build workflow --- .github/workflows/verify-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 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: