Skip to content

Commit 86122e0

Browse files
authored
chore: Ubuntu 18 build fixes (#733)
* chore: ubuntu 18 fixes * chore: fix gpg key fetch for ubuntu 18.04 * chore: more U18-specific fixes * chore: fix apt-key errors * chore: pg12 specific changes * chore: fix pg upgrade initiate script
1 parent e7c7b15 commit 86122e0

File tree

8 files changed

+1077
-22
lines changed

8 files changed

+1077
-22
lines changed

.github/workflows/ami-build-ubuntu-18.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,19 @@ jobs:
5050
with:
5151
push: false
5252
load: true
53+
file: Dockerfile-u18
5354
build-args: |
5455
${{ steps.args.outputs.result }}
5556
target: extensions
56-
tags: supabase/postgres:extensions
57+
tags: supabase/postgres:extensions-u18
5758
platforms: linux/${{ matrix.arch }}
5859
cache-from: type=gha
59-
cache-to: type=gha,mode=max
60+
cache-to: type=gha,mode=max,ignore-error=true
6061

6162
- name: Extract built packages
6263
run: |
6364
mkdir -p /tmp/extensions ansible/files/extensions
64-
docker save supabase/postgres:extensions | tar xv -C /tmp/extensions
65+
docker save supabase/postgres:extensions-u18 | tar xv -C /tmp/extensions
6566
for layer in /tmp/extensions/*/layer.tar; do
6667
tar xvf "$layer" -C ansible/files/extensions --strip-components 1
6768
done
@@ -80,11 +81,11 @@ jobs:
8081
ubuntu_release_no=${{ matrix.ubuntu_version }}
8182
postgresql_major=${{ steps.version.outputs.postgresql_major }}
8283
postgresql_release=${{ steps.version.outputs.postgresql_release }}
83-
CPPFLAGS=-mcpu=${{ matrix.mcpu }}
84+
DEB_BUILD_PROFILES=pkg.postgresql.nozstd
8485
tags: supabase/postgres:deb-u18
8586
platforms: linux/${{ matrix.arch }}
8687
cache-from: type=gha
87-
cache-to: type=gha,mode=max
88+
cache-to: type=gha,mode=max,ignore-error=true
8889
- name: Extract Postgres deb
8990
run: |
9091
mkdir -p /tmp/build ansible/files/postgres

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5050
&& rm -rf /var/lib/apt/lists/*
5151
# Add Postgres PPA
5252
ARG postgresql_gpg_key=B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
53-
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "${postgresql_gpg_key}" && \
53+
RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg && \
54+
gpg --recv-keys --no-default-keyring --keyring /tmp/pgdg.key --keyserver pgp.mit.edu --recv-keys "${postgresql_gpg_key}" && \
55+
gpg --no-default-keyring --keyring /tmp/pgdg.key --export "${postgresql_gpg_key}" > /etc/apt/trusted.gpg.d/pgdg.gpg && \
5456
echo "deb https://apt-archive.postgresql.org/pub/repos/apt focal-pgdg-archive main" > /etc/apt/sources.list.d/pgdg.list
5557

5658
####################

0 commit comments

Comments
 (0)