From d1e83a250128777b0231a7bf2d3acc0bce7445ac Mon Sep 17 00:00:00 2001 From: Jamie Murphy Date: Mon, 23 Jan 2023 12:14:15 +0000 Subject: [PATCH 1/2] add redis repo re #13478 adding the redis repo to the docker-database image remove sudo add gpupg for apt redis repo key add gpupg for apt redis repo key Update Dockerfile.j2 --- dockers/docker-database/Dockerfile.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dockers/docker-database/Dockerfile.j2 b/dockers/docker-database/Dockerfile.j2 index f5a8ec083675..eef3c4f21134 100644 --- a/dockers/docker-database/Dockerfile.j2 +++ b/dockers/docker-database/Dockerfile.j2 @@ -9,6 +9,12 @@ ENV DEBIAN_FRONTEND=noninteractive # Update apt's cache of available packages RUN apt-get update +# Add redis's repo +RUN apt-get install -y gnupg +RUN curl -fsSL https://packages.redis.io/gpg | gpg --dearmor -o /usr/share/keyrings/redis-archive-keyring.gpg +RUN echo "deb [signed-by=/usr/share/keyrings/redis-archive-keyring.gpg] https://packages.redis.io/deb bullseye main" | tee /etc/apt/sources.list.d/redis.list +RUN apt-get update + # Install redis-server RUN apt-get install -y redis-tools redis-server From 50ef1bcd57a1945c2798482e1b5fe2334d360720 Mon Sep 17 00:00:00 2001 From: "Jamie (Bear) Murphy" <1613241+ITJamie@users.noreply.github.com> Date: Thu, 6 Apr 2023 12:14:31 +0100 Subject: [PATCH 2/2] add redis gpg to trusted gpg's --- rules/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/config b/rules/config index c01adc0f5390..ba908459cc1e 100644 --- a/rules/config +++ b/rules/config @@ -221,7 +221,7 @@ SONIC_ENABLE_SECUREBOOT_SIGNATURE ?= n PACKAGE_URL_PREFIX ?= https://packages.trafficmanager.net/public/packages # TRUSTED_GPG_URLS - the trusted gpgs, separated by comma -TRUSTED_GPG_URLS = https://packages.trafficmanager.net/debian/public_key.gpg,https://packages.microsoft.com/keys/microsoft.asc +TRUSTED_GPG_URLS = https://packages.trafficmanager.net/debian/public_key.gpg,https://packages.microsoft.com/keys/microsoft.asc,https://packages.redis.io/gpg # SONIC_VERSION_CONTROL_COMPONENTS - Valid values: none|all|components..., the components consist of one or multiple: deb,py2,py3,web,git,docker, seperated by comma # none : disable the version control