From 54d72fb371a8fb0ee004cdb87ea5ca8887a76152 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 26 Dec 2023 13:56:44 -0800 Subject: [PATCH] docker: gpg should overwrite --- install/docker/Dockerfile.full | 4 ++-- install/docker/Dockerfile.lite | 2 +- install/docker/template/Dockerfile.full.footer | 2 +- install/docker/template/Dockerfile.full.header | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full index 620a22bf9..d5fe647d4 100644 --- a/install/docker/Dockerfile.full +++ b/install/docker/Dockerfile.full @@ -27,7 +27,7 @@ RUN apt-get update && apt-get -y install \ ARG NODE_VERSION=18 RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor --yes -o /etc/apt/keyrings/nodesource.gpg RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_"$NODE_VERSION".x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt-get update && apt-get install -y nodejs @@ -94,7 +94,7 @@ RUN bash -c "if [ \"$(uname -m)\" == \"x86_64\" ]; \ then \ apt-get update && apt-get install -y gpg-agent && \ rm -f /usr/share/keyrings/intel-graphics.gpg && \ - curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \ + curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg && \ echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \ apt-get -y update && \ apt-get -y install intel-opencl-icd intel-media-va-driver-non-free && \ diff --git a/install/docker/Dockerfile.lite b/install/docker/Dockerfile.lite index 50889a84d..f80ed0ea9 100644 --- a/install/docker/Dockerfile.lite +++ b/install/docker/Dockerfile.lite @@ -19,7 +19,7 @@ RUN apt-get update && apt-get -y install \ ARG NODE_VERSION=18 RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor --yes -o /etc/apt/keyrings/nodesource.gpg RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_"$NODE_VERSION".x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt-get update && apt-get install -y nodejs diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer index 37524d04e..4e37acbde 100644 --- a/install/docker/template/Dockerfile.full.footer +++ b/install/docker/template/Dockerfile.full.footer @@ -8,7 +8,7 @@ RUN bash -c "if [ \"$(uname -m)\" == \"x86_64\" ]; \ then \ apt-get update && apt-get install -y gpg-agent && \ rm -f /usr/share/keyrings/intel-graphics.gpg && \ - curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --output /usr/share/keyrings/intel-graphics.gpg && \ + curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg && \ echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee /etc/apt/sources.list.d/intel.gpu.jammy.list && \ apt-get -y update && \ apt-get -y install intel-opencl-icd intel-media-va-driver-non-free && \ diff --git a/install/docker/template/Dockerfile.full.header b/install/docker/template/Dockerfile.full.header index 7694a0d6c..0b5f04e4a 100644 --- a/install/docker/template/Dockerfile.full.header +++ b/install/docker/template/Dockerfile.full.header @@ -24,7 +24,7 @@ RUN apt-get update && apt-get -y install \ ARG NODE_VERSION=18 RUN apt-get install -y ca-certificates curl gnupg RUN mkdir -p /etc/apt/keyrings -RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg +RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor --yes -o /etc/apt/keyrings/nodesource.gpg RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_"$NODE_VERSION".x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt-get update && apt-get install -y nodejs