From 600318adba811a87528b50ee997b4f87211ac687 Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Tue, 31 May 2022 19:01:04 +0200 Subject: [PATCH 1/6] Ignore env files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a01ee289..2a7edbe9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .*.swp +.env From f5335eab090deaba5ed13007d0ab30f502400096 Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Tue, 31 May 2022 19:01:41 +0200 Subject: [PATCH 2/6] Allow customizing UID and GID --- dockerfiles/gnupg/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dockerfiles/gnupg/Dockerfile b/dockerfiles/gnupg/Dockerfile index 6a7a4008..b115e8f5 100644 --- a/dockerfiles/gnupg/Dockerfile +++ b/dockerfiles/gnupg/Dockerfile @@ -6,6 +6,8 @@ FROM docker.io/library/ubuntu:latest ARG GPG_KEYID=9D4B2B6EB8F97156D19669A9FF0812D491B96798 ARG VCS_REF=master ARG BUILD_DATE="" +ARG UID=1000 +ARG GID=1000 # metadata LABEL summary="Base image for GnuPG operations" \ @@ -22,8 +24,8 @@ LABEL summary="Base image for GnuPG operations" \ RUN apt-get update && apt-get install -yq --no-install-recommends bash ca-certificates curl gnupg RUN set -x \ - && groupadd -g 1000 nonroot \ - && useradd -u 1000 -g 1000 -s /bin/bash -m nonroot + && groupadd -g $GID nonroot \ + && useradd -u $UID -g $GID -s /bin/bash -m nonroot USER nonroot:nonroot From 93e2b4d98875244e6254a2c8d43befa19e3c8de4 Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Tue, 31 May 2022 19:01:58 +0200 Subject: [PATCH 3/6] New image --- dockerfiles/parity-keyring/Dockerfile | 38 +++++++++++++++++++++++++++ dockerfiles/parity-keyring/README.md | 11 ++++++++ 2 files changed, 49 insertions(+) create mode 100644 dockerfiles/parity-keyring/Dockerfile create mode 100644 dockerfiles/parity-keyring/README.md diff --git a/dockerfiles/parity-keyring/Dockerfile b/dockerfiles/parity-keyring/Dockerfile new file mode 100644 index 00000000..b5dd75da --- /dev/null +++ b/dockerfiles/parity-keyring/Dockerfile @@ -0,0 +1,38 @@ +ARG REGISTRY_PATH=docker.io/paritytech + +FROM docker.io/paritytech/gnupg:latest + +# 'Parity Security Team ' +ARG KEY_ID=9D4B2B6EB8F97156D19669A9FF0812D491B96798 +ARG KEY_SERVER=hkps://keys.mailvelope.com +ARG VCS_REF=master +ARG BUILD_DATE="" +ARG UID=1005 +ARG GID=1005 + +# metadata +LABEL summary="Base image with Parity-Keyring" \ + name="${REGISTRY_PATH}/parity-keyring" \ + maintainer="devops-team@parity.io" \ + version="1.0" \ + description="Parity Keyring base container" \ + io.parity.image.vendor="Parity Technologies" \ + io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/gnupg/Dockerfile" \ + io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/gnupg/README.md" \ + io.parity.image.revision="${VCS_REF}" \ + io.parity.image.created="${BUILD_DATE}" + +USER root + +RUN gpg --recv-keys --keyserver $KEY_SERVER $KEY_ID && \ + gpg --export $KEY_ID > /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 update && \ + apt install parity-keyring + +USER nonroot:nonroot + +RUN gpg /usr/share/keyrings/parity.gpg | grep -v expired + +WORKDIR /home/nonroot +CMD ["/bin/bash"] diff --git a/dockerfiles/parity-keyring/README.md b/dockerfiles/parity-keyring/README.md new file mode 100644 index 00000000..7a75e24d --- /dev/null +++ b/dockerfiles/parity-keyring/README.md @@ -0,0 +1,11 @@ +# parity-keyring + +A base Docker image based on [our gnupg image](https://hub.docker.com/repository/docker/paritytech/gnupg) and coming pre-installed with the parity keyring. + +[Click here](https://hub.docker.com/repository/docker/paritytech/parity-keyring) for the registry. + +## Usage + +``` +docker run --rm -it docker.io/paritytech/parity-keyring gpg --list-keys $KEY_ID +``` From 97d9dd383de84e76134818fbb719d6e67c9c9fab Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Tue, 31 May 2022 19:05:16 +0200 Subject: [PATCH 4/6] Cleanup --- dockerfiles/parity-keyring/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/dockerfiles/parity-keyring/Dockerfile b/dockerfiles/parity-keyring/Dockerfile index b5dd75da..3835f273 100644 --- a/dockerfiles/parity-keyring/Dockerfile +++ b/dockerfiles/parity-keyring/Dockerfile @@ -7,8 +7,6 @@ ARG KEY_ID=9D4B2B6EB8F97156D19669A9FF0812D491B96798 ARG KEY_SERVER=hkps://keys.mailvelope.com ARG VCS_REF=master ARG BUILD_DATE="" -ARG UID=1005 -ARG GID=1005 # metadata LABEL summary="Base image with Parity-Keyring" \ From 2753572446c62af8e1bad169907bb6485b959296 Mon Sep 17 00:00:00 2001 From: Chevdor Date: Wed, 1 Jun 2022 12:27:34 +0200 Subject: [PATCH 5/6] Update dockerfiles/parity-keyring/Dockerfile Co-authored-by: Mara Robin B. --- dockerfiles/parity-keyring/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/parity-keyring/Dockerfile b/dockerfiles/parity-keyring/Dockerfile index 3835f273..f43dd398 100644 --- a/dockerfiles/parity-keyring/Dockerfile +++ b/dockerfiles/parity-keyring/Dockerfile @@ -15,7 +15,7 @@ LABEL summary="Base image with Parity-Keyring" \ version="1.0" \ description="Parity Keyring base container" \ io.parity.image.vendor="Parity Technologies" \ - io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/gnupg/Dockerfile" \ + io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/parity-keyring/Dockerfile" \ io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/gnupg/README.md" \ io.parity.image.revision="${VCS_REF}" \ io.parity.image.created="${BUILD_DATE}" From 60cc0d3e69ba91abd1d05ed42479b61263faa8ab Mon Sep 17 00:00:00 2001 From: Chevdor Date: Wed, 1 Jun 2022 12:27:46 +0200 Subject: [PATCH 6/6] Update dockerfiles/parity-keyring/Dockerfile Co-authored-by: Mara Robin B. --- dockerfiles/parity-keyring/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/parity-keyring/Dockerfile b/dockerfiles/parity-keyring/Dockerfile index f43dd398..ae1b4ddb 100644 --- a/dockerfiles/parity-keyring/Dockerfile +++ b/dockerfiles/parity-keyring/Dockerfile @@ -16,7 +16,7 @@ LABEL summary="Base image with Parity-Keyring" \ description="Parity Keyring base container" \ io.parity.image.vendor="Parity Technologies" \ io.parity.image.source="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/parity-keyring/Dockerfile" \ - io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/gnupg/README.md" \ + io.parity.image.documentation="https://github.com/paritytech/scripts/blob/${VCS_REF}/dockerfiles/parity-keyring/README.md" \ io.parity.image.revision="${VCS_REF}" \ io.parity.image.created="${BUILD_DATE}"