From 1a809f5241299e601dd0a98685054e8a8a213d52 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 3 Jul 2025 18:55:43 +0900 Subject: [PATCH] use `wget | gpg` instead of `apt-key` warning: `apt-key` is deprecated --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fc8a01..9779b32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM ubuntu:jammy-20230605 AS add-apt-repositories RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y wget gnupg \ - && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' >> /etc/apt/sources.list + && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg \ + && echo 'deb [signed-by=/etc/apt/trusted.gpg.d/apt.postgresql.org.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' >> /etc/apt/sources.list FROM ubuntu:jammy-20230605 @@ -20,7 +20,7 @@ ENV PG_APP_HOME="/etc/docker-postgresql" \ ENV PG_BINDIR=/usr/lib/postgresql/${PG_VERSION}/bin \ PG_DATADIR=${PG_HOME}/${PG_VERSION}/main -COPY --from=add-apt-repositories /etc/apt/trusted.gpg /etc/apt/trusted.gpg +COPY --from=add-apt-repositories /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg COPY --from=add-apt-repositories /etc/apt/sources.list /etc/apt/sources.list