Merge pull request #520 from infosiftr/signed-by

Switch from apt-key/trusted.gpg(.d) to signed-by
docker-library · Feb 11, 2022 · ed5764f · ed5764f
2 parents afaa3e8 + a5085fb
commit ed5764f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/4.0/Dockerfile b/4.0/Dockerfile
diff --git a/4.2/Dockerfile b/4.2/Dockerfile
diff --git a/4.4/Dockerfile b/4.4/Dockerfile
diff --git a/5.0/Dockerfile b/5.0/Dockerfile
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -66,10 +66,10 @@ RUN set -ex; \
 	for key; do \
 		gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
 	done; \
-	gpg --batch --export "$@" > /etc/apt/trusted.gpg.d/mongodb.gpg; \
+	mkdir -p /etc/apt/keyrings; \
+	gpg --batch --export "$@" > /etc/apt/keyrings/mongodb.gpg; \
 	command -v gpgconf && gpgconf --kill all || :; \
-	rm -r "$GNUPGHOME"; \
-	apt-key list
+	rm -r "$GNUPGHOME"
 
 # Allow build-time overrides (eg. to build image with MongoDB Enterprise version)
 # Options for MONGO_PACKAGE: mongodb-org OR mongodb-enterprise
@@ -80,7 +80,7 @@ ARG MONGO_REPO=repo.mongodb.org
 ENV MONGO_PACKAGE=${MONGO_PACKAGE} MONGO_REPO=${MONGO_REPO}
 
 ENV MONGO_MAJOR {{ if env.version != env.rcVersion then "testing" else env.version end }}
-RUN echo "deb http://$MONGO_REPO/apt/{{ target.image | gsub(":.*$"; "") }} {{ target.suite }}/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR {{ if target.image | test("^debian") then "main" else "multiverse" end }}" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
+RUN echo "deb [ signed-by=/etc/apt/keyrings/mongodb.gpg ] http://$MONGO_REPO/apt/{{ target.image | gsub(":.*$"; "") }} {{ target.suite }}/${MONGO_PACKAGE%-unstable}/$MONGO_MAJOR {{ if target.image | test("^debian") then "main" else "multiverse" end }}" | tee "/etc/apt/sources.list.d/${MONGO_PACKAGE%-unstable}.list"
 
 {{ if .notes then ( -}}
 # {{ .notes }}