From 23b5740a38eb96704eb3591238ab0aea7a059217 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 30 Apr 2025 13:03:17 +0100 Subject: [PATCH 1/5] pull keys from pgp.mongodb.com --- docker/enterprise/4.2/Dockerfile | 6 ++++++ docker/enterprise/4.4/Dockerfile | 3 +++ docker/enterprise/5.0/Dockerfile | 3 +++ 3 files changed, 12 insertions(+) diff --git a/docker/enterprise/4.2/Dockerfile b/docker/enterprise/4.2/Dockerfile index 3dc375d..e8b82d9 100644 --- a/docker/enterprise/4.2/Dockerfile +++ b/docker/enterprise/4.2/Dockerfile @@ -69,8 +69,13 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d + + ENV GPG_KEYS E162F504A20CDF15827F718D4B7C549A058F8B6B RUN set -ex; \ + # pull from pgp.mongodb.com rather than a keyserver which is not supported. + # (although apt-key is deprecated on newer ubuntu/debian.) + wget -qO - https://pgp.mongodb.com/server-4.2.asc | apt-key add - \ export GNUPGHOME="$(mktemp -d)"; \ echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf"; \ for key in $GPG_KEYS; do \ @@ -81,6 +86,7 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list + # Allow build-time overrides (eg. to build image with MongoDB Enterprise version) # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise # Options for MONGO_REPO: repo.mongodb.org OR repo.mongodb.com diff --git a/docker/enterprise/4.4/Dockerfile b/docker/enterprise/4.4/Dockerfile index d57625e..a0035a5 100644 --- a/docker/enterprise/4.4/Dockerfile +++ b/docker/enterprise/4.4/Dockerfile @@ -71,6 +71,9 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS 20691EEC35216C63CAF66CE1656408E390CFB1F5 RUN set -ex; \ + # pull from pgp.mongodb.com rather than a keyserver which is not supported. + # (although apt-key is deprecated on newer ubuntu/debian.) + wget -qO - https://pgp.mongodb.com/server-4.4.asc | apt-key add - \ export GNUPGHOME="$(mktemp -d)"; \ echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf"; \ for key in $GPG_KEYS; do \ diff --git a/docker/enterprise/5.0/Dockerfile b/docker/enterprise/5.0/Dockerfile index 2ce0f7d..100f0ee 100644 --- a/docker/enterprise/5.0/Dockerfile +++ b/docker/enterprise/5.0/Dockerfile @@ -74,6 +74,9 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d RUN set -ex; \ + # pull from pgp.mongodb.com rather than a keyserver which is not supported. + # (although apt-key is deprecated on newer ubuntu/debian.) + wget -qO - https://pgp.mongodb.com/server-5.0.asc | apt-key add - \ export GNUPGHOME="$(mktemp -d)"; \ set -- 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \ for key; do \ From 195b13ba6636c70708a1c6d25652ab998512b4d2 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 30 Apr 2025 13:07:48 +0100 Subject: [PATCH 2/5] whitespace --- docker/enterprise/4.2/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/enterprise/4.2/Dockerfile b/docker/enterprise/4.2/Dockerfile index e8b82d9..e011da0 100644 --- a/docker/enterprise/4.2/Dockerfile +++ b/docker/enterprise/4.2/Dockerfile @@ -69,8 +69,6 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d - - ENV GPG_KEYS E162F504A20CDF15827F718D4B7C549A058F8B6B RUN set -ex; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. @@ -86,7 +84,6 @@ RUN set -ex; \ rm -r "$GNUPGHOME"; \ apt-key list - # Allow build-time overrides (eg. to build image with MongoDB Enterprise version) # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise # Options for MONGO_REPO: repo.mongodb.org OR repo.mongodb.com From fdf80c7a708aa6a1bf3891f17db7459c6a888a15 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 30 Apr 2025 14:52:02 +0100 Subject: [PATCH 3/5] install wget --- docker/enterprise/4.2/Dockerfile | 1 + docker/enterprise/4.4/Dockerfile | 1 + docker/enterprise/5.0/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/docker/enterprise/4.2/Dockerfile b/docker/enterprise/4.2/Dockerfile index e011da0..a82d888 100644 --- a/docker/enterprise/4.2/Dockerfile +++ b/docker/enterprise/4.2/Dockerfile @@ -71,6 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS E162F504A20CDF15827F718D4B7C549A058F8B6B RUN set -ex; \ + apt-get install -y --no-install-recommends wget \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) wget -qO - https://pgp.mongodb.com/server-4.2.asc | apt-key add - \ diff --git a/docker/enterprise/4.4/Dockerfile b/docker/enterprise/4.4/Dockerfile index a0035a5..3aac636 100644 --- a/docker/enterprise/4.4/Dockerfile +++ b/docker/enterprise/4.4/Dockerfile @@ -71,6 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS 20691EEC35216C63CAF66CE1656408E390CFB1F5 RUN set -ex; \ + apt-get install -y --no-install-recommends wget \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) wget -qO - https://pgp.mongodb.com/server-4.4.asc | apt-key add - \ diff --git a/docker/enterprise/5.0/Dockerfile b/docker/enterprise/5.0/Dockerfile index 100f0ee..2d712d4 100644 --- a/docker/enterprise/5.0/Dockerfile +++ b/docker/enterprise/5.0/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d RUN set -ex; \ + apt-get install -y --no-install-recommends wget \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) wget -qO - https://pgp.mongodb.com/server-5.0.asc | apt-key add - \ From a67e6c66deabf8c3b01a25ba9cc8f5d620c2ed04 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 30 Apr 2025 15:20:04 +0100 Subject: [PATCH 4/5] semicolon --- docker/enterprise/4.2/Dockerfile | 4 ++-- docker/enterprise/4.4/Dockerfile | 4 ++-- docker/enterprise/5.0/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/enterprise/4.2/Dockerfile b/docker/enterprise/4.2/Dockerfile index a82d888..8d40236 100644 --- a/docker/enterprise/4.2/Dockerfile +++ b/docker/enterprise/4.2/Dockerfile @@ -71,10 +71,10 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS E162F504A20CDF15827F718D4B7C549A058F8B6B RUN set -ex; \ - apt-get install -y --no-install-recommends wget \ + apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) - wget -qO - https://pgp.mongodb.com/server-4.2.asc | apt-key add - \ + wget -qO - https://pgp.mongodb.com/server-4.2.asc | apt-key add -; \ export GNUPGHOME="$(mktemp -d)"; \ echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf"; \ for key in $GPG_KEYS; do \ diff --git a/docker/enterprise/4.4/Dockerfile b/docker/enterprise/4.4/Dockerfile index 3aac636..311a8c2 100644 --- a/docker/enterprise/4.4/Dockerfile +++ b/docker/enterprise/4.4/Dockerfile @@ -71,10 +71,10 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS 20691EEC35216C63CAF66CE1656408E390CFB1F5 RUN set -ex; \ - apt-get install -y --no-install-recommends wget \ + apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) - wget -qO - https://pgp.mongodb.com/server-4.4.asc | apt-key add - \ + wget -qO - https://pgp.mongodb.com/server-4.4.asc | apt-key add -; \ export GNUPGHOME="$(mktemp -d)"; \ echo "disable-ipv6" >> "${GNUPGHOME}/dirmngr.conf"; \ for key in $GPG_KEYS; do \ diff --git a/docker/enterprise/5.0/Dockerfile b/docker/enterprise/5.0/Dockerfile index 2d712d4..7192a4a 100644 --- a/docker/enterprise/5.0/Dockerfile +++ b/docker/enterprise/5.0/Dockerfile @@ -74,10 +74,10 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d RUN set -ex; \ - apt-get install -y --no-install-recommends wget \ + apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) - wget -qO - https://pgp.mongodb.com/server-5.0.asc | apt-key add - \ + wget -qO - https://pgp.mongodb.com/server-5.0.asc | apt-key add -; \ export GNUPGHOME="$(mktemp -d)"; \ set -- 'F5679A222C647C87527C2F8CB00A0BD1E2C63C11'; \ for key; do \ From ac8e6675fcd769f0bfc868c3ac73cdd8bcdcc792 Mon Sep 17 00:00:00 2001 From: Le Roux Bodenstein Date: Wed, 30 Apr 2025 15:47:56 +0100 Subject: [PATCH 5/5] apt-get update --- docker/enterprise/4.2/Dockerfile | 1 + docker/enterprise/4.4/Dockerfile | 1 + docker/enterprise/5.0/Dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/docker/enterprise/4.2/Dockerfile b/docker/enterprise/4.2/Dockerfile index 8d40236..7d135c4 100644 --- a/docker/enterprise/4.2/Dockerfile +++ b/docker/enterprise/4.2/Dockerfile @@ -71,6 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS E162F504A20CDF15827F718D4B7C549A058F8B6B RUN set -ex; \ + apt-get update; \ apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) diff --git a/docker/enterprise/4.4/Dockerfile b/docker/enterprise/4.4/Dockerfile index 311a8c2..04f34ba 100644 --- a/docker/enterprise/4.4/Dockerfile +++ b/docker/enterprise/4.4/Dockerfile @@ -71,6 +71,7 @@ RUN mkdir /docker-entrypoint-initdb.d ENV GPG_KEYS 20691EEC35216C63CAF66CE1656408E390CFB1F5 RUN set -ex; \ + apt-get update; \ apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.) diff --git a/docker/enterprise/5.0/Dockerfile b/docker/enterprise/5.0/Dockerfile index 7192a4a..00960a2 100644 --- a/docker/enterprise/5.0/Dockerfile +++ b/docker/enterprise/5.0/Dockerfile @@ -74,6 +74,7 @@ RUN set -ex; \ RUN mkdir /docker-entrypoint-initdb.d RUN set -ex; \ + apt-get update; \ apt-get install -y --no-install-recommends wget; \ # pull from pgp.mongodb.com rather than a keyserver which is not supported. # (although apt-key is deprecated on newer ubuntu/debian.)