Skip to content

Commit

Permalink
Use asc
Browse files Browse the repository at this point in the history
  • Loading branch information
@kou
kou committed Jan 1, 2025
1 parent 4faf613 commit 9265b46
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 19 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
postgresql-version:
- "15"
- "16"
- "17"
steps:
- uses: actions/checkout@v4
- name: Prepare
Expand Down
6 changes: 4 additions & 2 deletions ci/scripts/prepare-ubuntu.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions package/apt/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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::"
Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
6 changes: 3 additions & 3 deletions package/postgresql-17-pgdg/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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/*

Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-17-pgdg/apt/debian-bookworm-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
7 changes: 5 additions & 2 deletions package/postgresql-17-pgdg/apt/ubuntu-noble-amd64/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down

0 comments on commit 9265b46

Please sign in to comment.