From 635ebabc551716a5cb59e99350345900b81e6286 Mon Sep 17 00:00:00 2001 From: EgorPopelyaev Date: Tue, 17 Mar 2026 09:41:17 +0100 Subject: [PATCH] Add gcp key to images --- base-bin/Dockerfile | 5 +++-- gnupg/Dockerfile | 11 ++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/base-bin/Dockerfile b/base-bin/Dockerfile index 2f37631..b995892 100644 --- a/base-bin/Dockerfile +++ b/base-bin/Dockerfile @@ -6,6 +6,7 @@ ARG BUILD_DATE ARG GPG_KEYSERVER="keyserver.ubuntu.com" ARG PARITY_SEC_GPGKEY=9D4B2B6EB8F97156D19669A9FF0812D491B96798 ARG PARITY_SEC_PGPKMSKEY=90BD75EBBB8E95CB3DA6078F94A4029AB4B35DAE +ARG PARITY_SEC_PGPKMSKEY_GCP=CEF548177CEF100D77D82B602FB7D309A53DF6B3 ARG DOC_URL=https://github.com/paritytech/polkadot ARG USER=parity @@ -27,8 +28,8 @@ RUN apt-get update && \ libssl3 ca-certificates gnupg && \ useradd -m -u 1000 -U -s /bin/sh -d /${USER} ${USER} && \ # add repo's gpg keys and install the published polkadot binary - gpg --keyserver ${GPG_KEYSERVER} --recv-keys ${PARITY_SEC_GPGKEY} ${PARITY_SEC_PGPKMSKEY} && \ - gpg --export ${PARITY_SEC_GPGKEY} ${PARITY_SEC_PGPKMSKEY} > /usr/share/keyrings/parity.gpg && \ + gpg --keyserver ${GPG_KEYSERVER} --recv-keys ${PARITY_SEC_GPGKEY} ${PARITY_SEC_PGPKMSKEY} ${PARITY_SEC_PGPKMSKEY_GCP}&& \ + gpg --export ${PARITY_SEC_GPGKEY} ${PARITY_SEC_PGPKMSKEY} ${PARITY_SEC_PGPKMSKEY_GCP} > /usr/share/keyrings/parity.gpg && \ echo 'deb [signed-by=/usr/share/keyrings/parity.gpg] https://releases.parity.io/deb release main' > /etc/apt/sources.list.d/parity.list && \ apt-get update && \ # apt cleanup diff --git a/gnupg/Dockerfile b/gnupg/Dockerfile index cbae08f..87503de 100644 --- a/gnupg/Dockerfile +++ b/gnupg/Dockerfile @@ -1,9 +1,12 @@ -ARG REGISTRY_PATH=docker.io/paritytech - FROM docker.io/library/ubuntu:latest +ARG REGISTRY_PATH=docker.io/paritytech # 'Parity Security Team ' ARG GPG_KEYID=9D4B2B6EB8F97156D19669A9FF0812D491B96798 +# 'Parity Release Team ' +ARG PARITY_SEC_PGPKMSKEY=90BD75EBBB8E95CB3DA6078F94A4029AB4B35DAE +ARG PARITY_SEC_PGPKMSKEY_GCP=CEF548177CEF100D77D82B602FB7D309A53DF6B3 +ARG GPG_KEYSERVER="keyserver.ubuntu.com" ARG VCS_REF=master ARG BUILD_DATE="" ARG UID=1001 @@ -29,7 +32,9 @@ RUN set -x \ USER nonroot:nonroot -RUN curl -LfSs "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x${GPG_KEYID}&options=mr&exact=on" | gpg --import - \ +RUN curl -LfSs "https://${GPG_KEYSERVER}/pks/lookup?op=get&search=0x${GPG_KEYID}&options=mr&exact=on" | gpg --import - \ + && curl -LfSs "https://${GPG_KEYSERVER}/pks/lookup?op=get&search=0x${PARITY_SEC_PGPKMSKEY}&options=mr&exact=on" | gpg --import - \ + && curl -LfSs "https://${GPG_KEYSERVER}/pks/lookup?op=get&search=0x${PARITY_SEC_PGPKMSKEY_GCP}&options=mr&exact=on" | gpg --import - \ && gpg --list-keys WORKDIR /home/nonroot