Merge branch 'release/1.0.1'

rdkcentral · Sep 13, 2024 · 3c4b811 · 3c4b811
2 parents dad9c15 + 449b10c
commit 3c4b811
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git 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/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.0.1](https://github.com/rdkcentral/docker-rdk-ci/compare/1.0.0...1.0.1)
+
+- Add nodejs to docker-rdk-ci container [`#6`](https://github.com/rdkcentral/docker-rdk-ci/pull/6)
+- RDKE-61: Use common GH context variables [`#4`](https://github.com/rdkcentral/docker-rdk-ci/pull/4)
+
 #### 1.0.0
 
+> 21 June 2024
+
+- RDKE-61: Use common GH context variables (#4) [`#5`](https://github.com/rdkcentral/docker-rdk-ci/pull/5)
+- RDKE-61: Open container for RDK CI [`03771be`](https://github.com/rdkcentral/docker-rdk-ci/commit/03771be85070e77c164c4181e8913dd69af17481)
 - RDKE-61: Open container for RDK CI [`8b1d8fc`](https://github.com/rdkcentral/docker-rdk-ci/commit/8b1d8fc8847f2784c9460e824e68332b23cc58f6)
 - Initial commit [`89f978e`](https://github.com/rdkcentral/docker-rdk-ci/commit/89f978e3377632c24ea849fb4e1897369c25e1c5)
diff --git 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/*