Remove usage of apt-key, fix for debian version

tweedegolf · May 14, 2024 · a2d71fb · a2d71fb
1 parent da11073
commit a2d71fb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 54 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
diff --git a/8.2/Dockerfile b/8.2/Dockerfile
@@ -1,20 +1,23 @@
 ARG DEBIAN_VERSION
 FROM ghcr.io/tweedegolf/debian:${DEBIAN_VERSION}
+ARG DEBIAN_VERSION
 
 # Install postgresql client
 ARG POSTGRESQL_VERSION
 ENV POSTGRESQL_VERSION ${POSTGRESQL_VERSION}
-RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+RUN install -d /usr/share/postgresql-common/pgdg \
+    && curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    && echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] http://apt.postgresql.org/pub/repos/apt/ $DEBIAN_VERSION-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         postgresql-client-$POSTGRESQL_VERSION \
     && rm -rf /var/lib/apt/lists/*
 
 # Install the custom PHP repository
 ENV PHP_VERSION 8.2
-RUN curl -s -L https://packages.sury.org/php/apt.gpg | apt-key add - \
-    && echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/sury_php.list \
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb \
+    && dpkg -i /tmp/debsuryorg-archive-keyring.deb \
+    && echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/php.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         php${PHP_VERSION}-bcmath \

diff --git a/8.3/Dockerfile b/8.3/Dockerfile
@@ -1,20 +1,23 @@
 ARG DEBIAN_VERSION
 FROM ghcr.io/tweedegolf/debian:${DEBIAN_VERSION}
+ARG DEBIAN_VERSION
 
 # Install postgresql client
 ARG POSTGRESQL_VERSION
 ENV POSTGRESQL_VERSION ${POSTGRESQL_VERSION}
-RUN curl -s -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+RUN install -d /usr/share/postgresql-common/pgdg \
+    && curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    && echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] http://apt.postgresql.org/pub/repos/apt/ $DEBIAN_VERSION-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         postgresql-client-$POSTGRESQL_VERSION \
     && rm -rf /var/lib/apt/lists/*
 
 # Install the custom PHP repository
 ENV PHP_VERSION 8.3
-RUN curl -s -L https://packages.sury.org/php/apt.gpg | apt-key add - \
-    && echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/sury_php.list \
+RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb \
+    && dpkg -i /tmp/debsuryorg-archive-keyring.deb \
+    && echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/php.list \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         php${PHP_VERSION}-bcmath \