Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions base-bin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
11 changes: 8 additions & 3 deletions gnupg/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <security@parity.io>'
ARG GPG_KEYID=9D4B2B6EB8F97156D19669A9FF0812D491B96798
# 'Parity Release Team <release-team@parity.io>'
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
Expand All @@ -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
Expand Down
Loading