Use asc

Author: kou

.github/workflows/test.yaml

@@ -42,6 +42,7 @@ jobs:
         postgresql-version:
           - "15"
           - "16"
+          - "17"
     steps:
       - uses: actions/checkout@v4
       - name: Prepare

ci/scripts/prepare-ubuntu.sh

@@ -35,12 +35,14 @@ wget https://apache.jfrog.io/artifactory/arrow/${os}/${apt_source_deb}
 sudo apt install -y -V ./${apt_source_deb}
 
 wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-  sudo gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
+  gpg --no-default-keyring --keyring ./pgdg.kbx --import -
+gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor | \
+  tee /usr/share/keyrings/pgdg.asc
 (echo "Types: deb"; \
  echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
  echo "Suites: ${code_name}-pgdg"; \
  echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
   sudo tee /etc/apt/sources.list.d/pgdg.sources
 
 sudo apt update

package/apt/test.sh

@@ -96,12 +96,14 @@ case "${TYPE}" in
 esac
 
 wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-  gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
+  gpg --no-default-keyring --keyring ./pgdg.kbx --import -
+gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor | \
+  tee /usr/share/keyrings/pgdg.asc
 (echo "Types: deb"; \
  echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
  echo "Suites: ${code_name}-pgdg"; \
  echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
   tee /etc/apt/sources.list.d/pgdg.sources
 
 echo "::endgroup::"

package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile

@@ -46,12 +46,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \

package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile

@@ -42,12 +42,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \

package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile

@@ -46,12 +46,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \

package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile

@@ -42,12 +42,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \

package/postgresql-17-pgdg/Dockerfile

@@ -17,7 +17,7 @@
 
 FROM postgres:17-bookworm
 
-COPY package/docker/postgresql-16-pgdg-apache-arrow-flight-sql_*_amd64.deb ./
+COPY package/docker/postgresql-17-pgdg-apache-arrow-flight-sql_*_amd64.deb ./
 RUN \
   apt update && \
   apt install -y -V lsb-release wget && \
@@ -26,8 +26,8 @@ RUN \
   rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
   apt update && \
   apt install -y -V \
-    ./postgresql-16-pgdg-apache-arrow-flight-sql_*.deb && \
-  rm -f postgresql-16-pgdg-apache-arrow-flight-sql_*.deb && \
+    ./postgresql-17-pgdg-apache-arrow-flight-sql_*.deb && \
+  rm -f postgresql-17-pgdg-apache-arrow-flight-sql_*.deb && \
   apt clean && \
   rm -rf /var/lib/apt/lists/*
 

package/postgresql-17-pgdg/apt/debian-bookworm-amd64/Dockerfile

@@ -46,12 +46,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \

package/postgresql-17-pgdg/apt/ubuntu-noble-amd64/Dockerfile

@@ -42,12 +42,15 @@ RUN \
     ./apache-arrow-apt-source-latest-${code_name}.deb && \
   rm apache-arrow-apt-source-latest-${code_name}.deb && \
   wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
-    gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import - && \
+    gpg --no-default-keyring --keyring ./pgdg.gpg --import - && \
+  gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+    /usr/share/keyrings/pgdg.asc && \
+  rm pgdg.kbx && \
   (echo "Types: deb"; \
    echo "URIs: http://apt.postgresql.org/pub/repos/apt"; \
    echo "Suites: ${code_name}-pgdg"; \
    echo "Components: main"; \
-   echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+   echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
     tee /etc/apt/sources.list.d/pgdg.sources && \
   apt update && \
   apt install -y -V ${quiet} \